tree 427cc9e74e91c4d4ec957d28c75a9f5a68f42215
parent 27912dfd866f2631803a35c1ec47b6f31f8d2054
parent 38ba43a45e5c9c9e82d07bd35c06a32cde9b234d
author Selim Cinek <cinek@google.com> 1440804964 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440804964 +0000

am 38ba43a4: am 60337b6b: am e774bdd6: Merge "Added animation for trusted to fingerprint error" into mnc-dr-dev

* commit '38ba43a45e5c9c9e82d07bd35c06a32cde9b234d':
  Added animation for trusted to fingerprint error