diff options
| author | Jeff Brown <jeffbrown@google.com> | 2015-03-27 00:33:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 00:33:21 +0000 |
| commit | 64646defa7d01ca4105a5da8cc8d0999dac1543d (patch) | |
| tree | 294e990a893ce82700661898c1065b1080e952c9 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | a7dbe970bc8f6c90b4e68ffd2146f988aca85ac0 (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.cpp')
0 files changed, 0 insertions, 0 deletions