tree 78d04e639ab91c74b16ca93ccf4a11ba4fb2d001
parent 7ef6b8d7449c1cf629e227a948f72bf73fcddb57
parent 302475e93ce00287770aba9668acbe86e8b20a05
author Jorim Jaggi <jjaggi@google.com> 1442973481 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442973481 +0000

am 302475e9: Fix verifyUnlock

* commit '302475e93ce00287770aba9668acbe86e8b20a05':
  Fix verifyUnlock