commit | 994ba63f89cf5ec472b4b13ecbe306cce4241a27 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Thu Sep 25 18:57:20 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 25 18:57:20 2014 +0000 |
tree | 4c271dcf4bb9000df4913e975f6023ed217dc0da | |
parent | fdc6b9f4372b55953ccd0ebf21ffb42c6fcbe6af [diff] | |
parent | 809c1be06be65f45d06107cd701b2a06145cfb8f [diff] |
am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev * commit '7c4b941336300efc04e8842dc21a24f1c17bf345': Fix pause when setting pin/pattern/password