tree 672895a1c8eea30521eb21546dd76b19bbf227f9
parent c708b2b0df1ed233572cfe8467a632d4c22eae52
parent 1517c365aaf0d0248072f8292d5318dd4b7a80fe
author Selim Cinek <cinek@google.com> 1440807746 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440807746 +0000

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

* commit '1517c365aaf0d0248072f8292d5318dd4b7a80fe':
  Added animation for trusted to fingerprint error