diff options
| author | Paul Westbrook <pwestbro@google.com> | 2009-12-14 10:56:45 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2009-12-14 10:56:45 -0800 |
| commit | e143bc92b2dfa205ea6af80855132bf52e018688 (patch) | |
| tree | 46933356cfa47695992d68e3336788d50ad8f7f5 /preloaded-classes | |
| parent | 1a500c46ef3be3316616f7bb3eaf8ade05262359 (diff) | |
| parent | 15d3bb2ce6b3e48608148d56b2ba1555ad63dff8 (diff) | |
| download | frameworks_base-e143bc92b2dfa205ea6af80855132bf52e018688.zip frameworks_base-e143bc92b2dfa205ea6af80855132bf52e018688.tar.gz frameworks_base-e143bc92b2dfa205ea6af80855132bf52e018688.tar.bz2 | |
resolved conflicts for merge of 15d3bb2c to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/preloaded-classes b/preloaded-classes index 523b7df..1311335 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -234,10 +234,6 @@ android.net.Uri$PathPart android.net.Uri$PathSegments android.net.Uri$StringUri android.net.WebAddress -android.net.http.AndroidHttpClient -android.net.http.AndroidHttpClient$1 -android.net.http.AndroidHttpClient$2 -android.net.http.AndroidHttpClient$CurlLogger android.net.http.DomainNameChecker android.net.http.CertificateChainValidator android.net.http.EventHandler @@ -368,7 +364,13 @@ 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 @@ -693,10 +695,17 @@ 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 |