| commit | ca38911533a538d74bcd5adbe1b009a0ccdf203f | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Fri Sep 26 15:26:05 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 26 15:26:05 2014 +0000 |
| tree | 8336698cf6b364b16e48f4164571301c74a72899 | |
| parent | f5085b518cde136130866e78c4487fcf939048f5 [diff] | |
| parent | 1d1ebd7f98c9abdc75a25652cb69c2d74cdcd51d [diff] |
am 342d9c5f: am 98a18468: am 433d70d3: am 7c4b9413: am 56a38862: Merge "Fix pause when setting pin/pattern/password" into lmp-dev * commit '342d9c5f8f79b3189e803b19a148da9e6bd5c44a': Fix pause when setting pin/pattern/password