| commit | cb714ae68e3d1c0047fdb6980fabcafcd57b37b6 | [log] [tgz] |
|---|---|---|
| author | Zhihai Xu <zhihaixu@google.com> | Tue Mar 11 19:19:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 11 19:19:05 2014 +0000 |
| tree | 3d55da3525450d6c908195487ce04f5be13ef17d | |
| parent | dbba6f076999afaad720c7c5657f7cbf9cdf2d14 [diff] | |
| parent | 74f36d31892d8fdfddbecc7bf3018aa3a190e5fb [diff] |
am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev * commit '74f36d31892d8fdfddbecc7bf3018aa3a190e5fb': DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""