OSDN Git Service

Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6
authorMaurice Lam <yukl@google.com>
Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)
commit6b5f99bcbd1a76b4c25bd44ef1b8597340dbfbff
tree8984bdb9a0dd618fa4b2709d1874de561642efab
parent4c2fc34707a98af66660e287601d7cafcd4c4957
parentd415cbfc0d976ea1b8bc1e43cf36357d9b17ce12
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6
am: d415cbfc0d

Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
src/com/android/settings/fingerprint/FingerprintEnrollEnrolling.java