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

Merge commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b'

* commit 'ef8e6b5672c91baab09d5699b5a3ca0cb33ced6b':
  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);