diff options
| author | Adrian Roos <roosa@google.com> | 2015-09-03 19:40:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-03 19:40:18 +0000 |
| commit | 1fa723d8ab2a09ca905257bb6fd58c257048e647 (patch) | |
| tree | 7f469895592c2ae38d17097670e84054ced14709 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 988f37858718534e9192c85b709a3d4a3c712fb5 (diff) | |
| parent | 4008702700b9e14c756d453deb3bdfaff9138e92 (diff) | |
am 40087027: am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev
* commit '4008702700b9e14c756d453deb3bdfaff9138e92':
Show face unlock even when fingerprint is running
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions