commit | b5d4f689d11afa2c0d7a1c6691afc56fdd23d6c1 | [log] [tgz] |
---|---|---|
author | Michael Wright <michaelwr@google.com> | Thu Aug 27 10:08:44 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:08:44 2015 +0000 |
tree | 715d547d2502de8d04de0ec12233b3183ce62c99 | |
parent | b9f946789fea8431a0a73cd8574bc787d26e7c35 [diff] | |
parent | 56700e24b4ea68701589ff731a3397fa8ee47ca8 [diff] |
am 56700e24: (-s ours) am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev * commit '56700e24b4ea68701589ff731a3397fa8ee47ca8':