tree cf056e44f9b11e90c66cb410dd7ff42302b9d9aa
parent 2e76f5d8a282f4f948f88208e77dc4b3d0ec6634
parent c48c9626bd2eb91aab33a034baf139aa2b92671d
author Zhihai Xu <zhihaixu@google.com> 1394559836 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394559836 +0000

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.""