diff options
author | Nick Armstrong-Crews <strongarm@google.com> | 2015-09-08 04:48:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-08 04:48:30 +0000 |
commit | dc6aa5fc53a85a3fcf98c1a01f766d9c16891765 (patch) | |
tree | 7d8effec5b71b5b9e58c01a898d670f4b5b4b35b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1fb5edd78395f68b3fcda3966ebf5330ccbe19c4 (diff) | |
parent | d70377b537450d03d5cdc2efb15977d48e5cfebd (diff) |
am d70377b5: am 36afc2b7: am 9b8f82a3: Merge "Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."" into cw-e-dev
* commit 'd70377b537450d03d5cdc2efb15977d48e5cfebd':
Revert "Handle KEYCODE_SOFT_SLEEP from Ungaze."
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions