OSDN Git Service

am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE...
authorZhihai Xu <zhihaixu@google.com>
Tue, 11 Mar 2014 17:43:56 +0000 (17:43 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Mar 2014 17:43:56 +0000 (17:43 +0000)
commit74f36d31892d8fdfddbecc7bf3018aa3a190e5fb
treecf056e44f9b11e90c66cb410dd7ff42302b9d9aa
parent2e76f5d8a282f4f948f88208e77dc4b3d0ec6634
parentc48c9626bd2eb91aab33a034baf139aa2b92671d
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.""