diff options
| author | Paul Westbrook <pwestbro@google.com> | 2009-12-14 16:54:34 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2009-12-14 16:54:34 -0800 |
| commit | 3f6f6807e57ba25846b0e1a9166ca964771d4b4e (patch) | |
| tree | 40d6d887544ccd2d76af7c877d9dd6b50f83b4cd /preloaded-classes | |
| parent | 781d10991ff67c9c564e20bc0fdd7a1b15d413ce (diff) | |
| download | frameworks_base-3f6f6807e57ba25846b0e1a9166ca964771d4b4e.zip frameworks_base-3f6f6807e57ba25846b0e1a9166ca964771d4b4e.tar.gz frameworks_base-3f6f6807e57ba25846b0e1a9166ca964771d4b4e.tar.bz2 | |
Fixed bad merge in preloaded-classes
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/preloaded-classes b/preloaded-classes index 1311335..1403b97 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -364,13 +364,6 @@ android.text.style.UpdateAppearance android.text.style.UpdateLayout android.text.style.WrapTogetherSpan android.text.util.Linkify -<<<<<<< HEAD -android.util.AndroidRuntimeException -======= -android.text.util.Linkify$1 -android.text.util.Linkify$4 -android.text.util.Rfc822Tokenizer ->>>>>>> 15d3bb2c android.util.AttributeSet android.util.DisplayMetrics android.util.FloatMath @@ -695,17 +688,6 @@ com.android.internal.view.menu.MenuBuilder$Callback com.android.internal.view.menu.MenuDialogHelper com.android.internal.view.menu.MenuItemImpl com.android.internal.view.menu.SubMenuBuilder -<<<<<<< HEAD -com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient -com.android.internal.widget.LockPatternView -com.android.internal.widget.NumberPicker -com.android.internal.widget.NumberPickerButton -======= -com.android.internal.widget.ContactHeaderWidget -com.android.internal.widget.DialogTitle -com.android.internal.widget.EditableInputConnection -com.android.internal.widget.LockPatternUtils ->>>>>>> 15d3bb2c com.android.internal.widget.RotarySelector com.android.internal.widget.Smileys com.google.android.gles_jni.EGLDisplayImpl |