diff options
author | Jim Miller <jaggies@google.com> | 2015-08-27 03:37:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 03:37:20 +0000 |
commit | 1aee37ea3f9ae87967a04aec26fd81caf5f8fea8 (patch) | |
tree | 94b79d81b25db7b0d82ac2d22a6724a14fe37be1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3fa76699f58275055aaeb229ddd00470795b25f9 (diff) | |
parent | d255b44c83fa3dfb460c2ef332761bde2cdc4956 (diff) |
am d255b44c: am dfb8cca0: Merge "Don\'t check the keyguard PIN a second time" into mnc-dr-dev
* commit 'd255b44c83fa3dfb460c2ef332761bde2cdc4956':
Don't check the keyguard PIN a second time
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions