diff options
author | Tim Kilbourn <tkilbourn@google.com> | 2015-09-02 17:28:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-02 17:28:08 +0000 |
commit | ee72f99dd14c8e531cd1a114d162a49636e7b809 (patch) | |
tree | 37ad8968f1a688b93838746e58f1d1e245fd550f /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | f7b220ab9f62be3d279e3fa7923c249ff0fa09f3 (diff) | |
parent | bba73a038e8d01f01bdc4ac0d61916af9efe7380 (diff) |
Merge "Allow shell to disable keyguard when not secure" into mnc-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions