tree 2a49ac0942ca56ae9f6463c2b4d2fd10c9b3efd1
parent 5f683ca80611c3e98c91f631ee05dccf3e7e0227
parent 82ec1442487d66935cb0c30f6da3545d8c33af6e
author Zhihai Xu <zhihaixu@google.com> 1394477387 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394477387 +0000

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