| commit | dcba24ae7de5b44b7d45cdb8d0fef2907f0283ee | [log] [tgz] |
|---|---|---|
| author | Zhihai Xu <zhihaixu@google.com> | Mon Mar 10 18:52:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 10 18:52:03 2014 +0000 |
| tree | 6288ae0d09d62fb63a9de32c0d68f5eb499addb4 | |
| parent | 5468a5c1179f5d27d2a6c52dfd1fc69ad233bfe9 [diff] | |
| parent | c48c9626bd2eb91aab33a034baf139aa2b92671d [diff] |
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.""