diff options
author | Jeff Brown <jeffbrown@google.com> | 2015-03-20 22:12:48 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:12:48 +0000 |
commit | c19279ef93628448fbfb142d85ff80a6ad230425 (patch) | |
tree | 53a3235cb2b37701ee2a2445a08c39a3e460ef1f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 630ff318727280fc55eb2ed69019ed43f1802c93 (diff) | |
parent | d62163055f983b95a954f1a6c2cbc8e0085a7ab5 (diff) |
am d6216305: Merge "Disable more hotkeys while in setup." into lmp-mr1-dev
* commit 'd62163055f983b95a954f1a6c2cbc8e0085a7ab5':
Disable more hotkeys while in setup.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions