tree 7094826fb458361be952ff1076b1412f15a19e4f
parent 47b9deba5bfdc135727232f52c1d192b6a2d611a
parent 744a7aa54b551bbdaa0edbd806e2a125801eb1c4
author Paul Lawrence <paullawrence@google.com> 1430415885 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430415885 +0000

am 744a7aa5: Merge "Check password is correct by checking hash"

* commit '744a7aa54b551bbdaa0edbd806e2a125801eb1c4':
  Check password is correct by checking hash