OSDN Git Service

am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and...
authorZhihai Xu <zhihaixu@google.com>
Mon, 10 Mar 2014 18:49:47 +0000 (18:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Mar 2014 18:49:47 +0000 (18:49 +0000)
commitc48c9626bd2eb91aab33a034baf139aa2b92671d
tree2a49ac0942ca56ae9f6463c2b4d2fd10c9b3efd1
parent5f683ca80611c3e98c91f631ee05dccf3e7e0227
parent82ec1442487d66935cb0c30f6da3545d8c33af6e
am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev

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