fixed two stray merge issues

2009-04-29 19:48:59 -07:00
parent c2bc16cd5a
commit bb15b1cb33
2 changed files with 1 additions and 2 deletions
--- 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>
--- 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>