diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-09-03 06:39:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 06:39:20 +0000 |
| commit | 0e6dab92b7dd756ca1d8e802debb3e1136932c75 (patch) | |
| tree | 84ddff62bb2ff61f768bb7d78fef38e899808427 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 13612c332a132a20d504e3b9977fbedd2ddeb833 (diff) | |
| parent | fca744cef6800bbf923780ff0537ad618c715685 (diff) | |
am fca744ce: am 573cdc42: am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit 'fca744cef6800bbf923780ff0537ad618c715685':
Allow shell to disable keyguard when not secure
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions