Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb15b1cb authored by android-build SharedAccount's avatar android-build SharedAccount
Browse files

fixed two stray merge issues

parent c2bc16cd

core/java/android/widget/AutoCompleteTextView.java

+0 −1
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/public.xml

+1 −1
Original line number Diff line number Diff line
@@ -1108,5 +1108,5 @@ 
     =============================================================== -->

  <eat-comment />



  <public type="attr" name="accountType" id="0x0101026c" />

  <public type="attr" name="accountType" id="0x0101026d" />

</resources>