diff options
| author | android-build SharedAccount <android-build@google.com> | 2009-04-29 19:48:59 -0700 |
|---|---|---|
| committer | android-build SharedAccount <android-build@google.com> | 2009-04-29 19:48:59 -0700 |
| commit | bb15b1cb330bafc0cac993ff0e6bf5c3ba7d10aa (patch) | |
| tree | 2186b6062e1e15b824089f2e6996cd782fdebb54 | |
| parent | c2bc16cd5a20f0e9558213a6ce31fbb054a52709 (diff) | |
| download | frameworks_base-bb15b1cb330bafc0cac993ff0e6bf5c3ba7d10aa.zip frameworks_base-bb15b1cb330bafc0cac993ff0e6bf5c3ba7d10aa.tar.gz frameworks_base-bb15b1cb330bafc0cac993ff0e6bf5c3ba7d10aa.tar.bz2 | |
fixed two stray merge issues
| -rw-r--r-- | core/java/android/widget/AutoCompleteTextView.java | 1 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java index 6d971a8..e11303d 100644 --- a/core/java/android/widget/AutoCompleteTextView.java +++ b/core/java/android/widget/AutoCompleteTextView.java @@ -259,7 +259,6 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe mDropDownAnchorId = id; mDropDownAnchorView = null; } -<<<<<<< HEAD:core/java/android/widget/AutoCompleteTextView.java /** * <p>Gets the background of the auto-complete drop-down list.</p> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 88eab61..477ca3f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1108,5 +1108,5 @@ =============================================================== --> <eat-comment /> - <public type="attr" name="accountType" id="0x0101026c" /> + <public type="attr" name="accountType" id="0x0101026d" /> </resources> |