am 1fb2a6cd: reconcile main tree with open-source eclair

Merge commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f' into eclair-plus-aosp

* commit '1fb2a6cd4c27847f8de8369b497f37d3d47c622f':
  android-2.1_r1 snapshot
diff --git a/policy/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
index 7be15e2..30f0d2d 100755
--- a/policy/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -1612,7 +1612,7 @@
                 code == KeyEvent.KEYCODE_MEDIA_STOP || 
                 code == KeyEvent.KEYCODE_MEDIA_NEXT ||
                 code == KeyEvent.KEYCODE_MEDIA_PREVIOUS || 
-                code == KeyEvent.KEYCODE_MEDIA_PREVIOUS ||
+                code == KeyEvent.KEYCODE_MEDIA_REWIND ||
                 code == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
             return true;
         }