OSDN Git Service

am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error...
authorSelim Cinek <cinek@google.com>
Fri, 28 Aug 2015 23:28:30 +0000 (23:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 28 Aug 2015 23:28:30 +0000 (23:28 +0000)
* commit '60337b6bd73bcf208c89c1d5ac6ff50d51c0700f':
  Added animation for trusted to fingerprint error


Trivial merge