commit | 1d1ebd7f98c9abdc75a25652cb69c2d74cdcd51d | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Fri Sep 26 00:23:53 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 00:23:53 2014 +0000 |
tree | 9b6a7f3d2d6f7ccc9d093878f8cfe17a65e65c96 | |
parent | 28c86a16c0df787d7b69b7438847f7c0d64195c0 [diff] | |
parent | 0d60086e583f29f99d7a742ac954cccff0f9e4b4 [diff] |
am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev * commit '98a18468ef2f6ec7f46c21015c0d8df42ea86ff5': Fix pause when setting pin/pattern/password