am 19400067: am 4625758d: Merge change I2c5f1e76 into eclair

Merge commit '19400067b2bca066255118315877125d1e623cad' into eclair-mr2-plus-aosp

* commit '19400067b2bca066255118315877125d1e623cad':
  Fix back button handling in ACTV

core/java/android/widget/AutoCompleteTextView.java

@@ -613,10 +613,12 @@ public class AutoCompleteTextView extends EditText implements Filter.FilterListe
                     && event.getRepeatCount() == 0) {
                 getKeyDispatcherState().startTracking(event, this);
                 return true;
-            } else if (event.getAction() == KeyEvent.ACTION_UP
-                    && event.isTracking() && !event.isCanceled()) {
-                dismissDropDown();
-                return true;
+            } else if (event.getAction() == KeyEvent.ACTION_UP) {
+                getKeyDispatcherState().handleUpEvent(event);
+                if (event.isTracking() && !event.isCanceled()) {
+                    dismissDropDown();
+                    return true;
+                }
             }
         }
         return super.onKeyPreIme(keyCode, event);