diff options
| author | Jim Miller <jaggies@google.com> | 2015-04-07 23:08:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-07 23:08:05 +0000 |
| commit | 5dd10bd11a524e224a88615444bf8b52b1ec11d6 (patch) | |
| tree | c4a67dd09e72eede4bdc54158d5530a2457948e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 66a51c7080f26219652f84ae8d10b1e4d63409af (diff) | |
| parent | e2e945a8871310ab900dbe33b587e522446b9a6d (diff) | |
am e2e945a8: am 40c4021a: Merge "third part apps can disable the secret lockscreen"
* commit 'e2e945a8871310ab900dbe33b587e522446b9a6d':
third part apps can disable the secret lockscreen
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions