diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-08-20 02:29:09 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 02:29:09 +0000 |
commit | e46b5b48235af0aebfc0afa86ea899204463ef8a (patch) | |
tree | c2e565a8a57315197fb0f555a5bd6c968969a086 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 60931a784ff5c7659a432ed7b4f5ea5a22156637 (diff) | |
parent | a2737beea11455c48b719c6d2f26d5908d4b8cd2 (diff) |
am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
* commit 'a2737beea11455c48b719c6d2f26d5908d4b8cd2':
Fix jank in wake-and-unlock while pulsing
Don't call authenticate immediately after getting valid fingerprint
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions