diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-05-16 16:27:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-05-16 16:27:06 -0700 |
| commit | c1ceb6c614d6489b5152588d1bb41689552d9b8e (patch) | |
| tree | 6a9fec5ea6833dacb2c647225fb680bab7afc2b0 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 00c53eb6ad6ec74dac2aa235b1f61d949ddca875 (diff) | |
| parent | 00ee17718af8a229d0e6a14cd1f47b56a8b14b0f (diff) | |
am 00ee1771: Merge "Don\'t allow shortcuts while keyguard showing." into jb-dev
* commit '00ee17718af8a229d0e6a14cd1f47b56a8b14b0f':
Don't allow shortcuts while keyguard showing.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions