diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2015-09-02 17:40:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-02 17:40:36 +0000 |
| commit | 7cd6aaafda35509607e945fcadc4a556f75ed23b (patch) | |
| tree | fa18f7ae813f3c706aee47286f7b9f2f6ce11307 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 582b186cd3b41c5c67649ae2ba9176c3860ab1ec (diff) | |
| parent | ee72f99dd14c8e531cd1a114d162a49636e7b809 (diff) | |
am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev
* commit 'ee72f99dd14c8e531cd1a114d162a49636e7b809':
Allow shell to disable keyguard when not secure
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions