commit 74f36d31892d8fdfddbecc7bf3018aa3a190e5fb
author Zhihai Xu <zhihaixu@google.com> Tue Mar 11 17:43:56 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 17:43:56 2014 +0000
tree cf056e44f9b11e90c66cb410dd7ff42302b9d9aa
parent 2e76f5d8a282f4f948f88208e77dc4b3d0ec6634
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