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