From bb15b1cb330bafc0cac993ff0e6bf5c3ba7d10aa Mon Sep 17 00:00:00 2001
From: android-build SharedAccount <android-build@google.com>
Date: Wed, 29 Apr 2009 19:48:59 -0700
Subject: [PATCH] fixed two stray merge issues

---
 core/java/android/widget/AutoCompleteTextView.java | 1 -
 core/res/res/values/public.xml                     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/widget/AutoCompleteTextView.java b/core/java/android/widget/AutoCompleteTextView.java
index 6d971a89cfb18..e11303d2db90b 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 88eab615ee9c8..477ca3f27ef84 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>