OSDN Git Service

Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev
authorJorim Jaggi <jjaggi@google.com>
Thu, 20 Aug 2015 02:18:20 +0000 (02:18 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 20 Aug 2015 02:18:20 +0000 (02:18 +0000)
commit1fa7384a101450c4619ed43e176d5a54aa0a54f3
tree2206e7a55433f4d7e946859536faea316e45ebae
parent2af6ec5198ed6edf7576c19a358afddcc4068ff7
parent909788500bbe54b14017be3c1f2b4fee7945c63d
Merge changes Ie8264c4d,Ic83ac0f1 into mnc-dr-dev

* changes:
  Fix jank in wake-and-unlock while pulsing
  Don't call authenticate immediately after getting valid fingerprint
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java