OSDN Git Service

am 0d6e1da5: am 87fadbe6: [Fingerprint] Help text for backup screen lock
authorMaurice Lam <yukl@google.com>
Tue, 4 Aug 2015 01:08:48 +0000 (01:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Aug 2015 01:08:48 +0000 (01:08 +0000)
* commit '0d6e1da536e99ad9e141812295e67727f78475f6':
  [Fingerprint] Help text for backup screen lock


Trivial merge