OSDN Git Service

Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54...
authorMaurice Lam <yukl@google.com>
Wed, 9 Aug 2017 00:02:12 +0000 (00:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Aug 2017 00:02:12 +0000 (00:02 +0000)
commitb2aa7e7da0ad4363df84b04a2a644991d42bd8d7
tree8223a997fd5728a20d90b968370a43f6749b167b
parentb5989fc3b7ed0c42a4b377bbb16e1f1253d49f3a
parent6b5f99bcbd1a76b4c25bd44ef1b8597340dbfbff
Merge "Show help string when onEnrollmentHelp() is called" am: 5a926705ef am: dbfde54fb6 am: d415cbfc0d
am: 6b5f99bcbd

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