diff options
| author | Fred Quintana <fredq@google.com> | 2009-11-24 11:39:32 -0800 |
|---|---|---|
| committer | Fred Quintana <fredq@google.com> | 2009-11-24 11:39:32 -0800 |
| commit | 5bb9771ec74b6e8db7136c1b10aefececcb33719 (patch) | |
| tree | 385112e9840d720e676c2e6209d91d74a1e2b2ae /preloaded-classes | |
| parent | d240b7489a39ad970a8f69e60331b82f3f53d85b (diff) | |
| parent | b867594323f430d83e4b51279c79d1f057b70267 (diff) | |
| download | frameworks_base-5bb9771ec74b6e8db7136c1b10aefececcb33719.zip frameworks_base-5bb9771ec74b6e8db7136c1b10aefececcb33719.tar.gz frameworks_base-5bb9771ec74b6e8db7136c1b10aefececcb33719.tar.bz2 | |
resolved conflicts for merge of b8675943 to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/preloaded-classes b/preloaded-classes index 55b7733..8f87a0c 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -698,8 +698,9 @@ com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient com.android.internal.widget.LockPatternView com.android.internal.widget.NumberPicker com.android.internal.widget.NumberPickerButton -com.google.android.gdata.client.AndroidGDataClient -com.google.android.gdata.client.AndroidGDataClient$PostRequestCreator +com.android.internal.widget.RotarySelector +com.android.internal.widget.Smileys +com.google.android.gles_jni.EGLDisplayImpl com.google.android.gles_jni.EGLImpl com.google.android.gles_jni.GLImpl com.google.android.mms.ContentType |