diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-08-20 02:38:49 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-20 02:38:49 +0000 |
commit | a0d5727078bdb47f19613b9c73e5d973281609f5 (patch) | |
tree | 4292ec007cb24c3f8b4aa973f884facfdecbdb33 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 8755f9ebb820007d8e568f2e664519ac8e4bc7d7 (diff) | |
parent | e46b5b48235af0aebfc0afa86ea899204463ef8a (diff) |
am e46b5b48: am a2737bee: am 1fa7384a: Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
* commit 'e46b5b48235af0aebfc0afa86ea899204463ef8a':
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