tree 4c271dcf4bb9000df4913e975f6023ed217dc0da
parent 7d7e39404a116f90ba5203a234de4c78bb21e263
parent 994ba63f89cf5ec472b4b13ecbe306cce4241a27
author Paul Lawrence <paullawrence@google.com> 1411672065 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411672065 +0000

am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev

* commit '433d70d348a21a9f2f15c5357a14c3955b751915':
  Fix pause when setting pin/pattern/password