commit dcba24ae7de5b44b7d45cdb8d0fef2907f0283ee
author Zhihai Xu <zhihaixu@google.com> Mon Mar 10 18:52:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 10 18:52:03 2014 +0000
tree 6288ae0d09d62fb63a9de32c0d68f5eb499addb4
parent 5468a5c1179f5d27d2a6c52dfd1fc69ad233bfe9
parent c48c9626bd2eb91aab33a034baf139aa2b92671d

am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

* commit 'c48c9626bd2eb91aab33a034baf139aa2b92671d':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""

data/keyboards/AVRCP.kl

diff --git a/data/keyboards/AVRCP.kl b/data/keyboards/AVRCP.kl
index 4c91ece..736b43c 100644
--- a/data/keyboards/AVRCP.kl
+++ b/data/keyboards/AVRCP.kl
@@ -14,8 +14,8 @@
 
 # Key layout used for Bluetooth AVRCP support.
 
-key 200   MEDIA_PLAY_PAUSE    WAKE
-key 201   MEDIA_PLAY_PAUSE    WAKE
+key 200   MEDIA_PLAY          WAKE
+key 201   MEDIA_PAUSE         WAKE
 key 166   MEDIA_STOP          WAKE
 key 163   MEDIA_NEXT          WAKE
 key 165   MEDIA_PREVIOUS      WAKE