| commit | 227ce43d432f152972f5697a1c1c028153b7a4bf | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Dec 11 01:38:27 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 01:38:27 2014 +0000 |
| tree | 2472b47fdd8fd947e67965fea63cf396c12a1873 | |
| parent | ccec890f494aa4da7498979c9751fad51f75b685 [diff] | |
| parent | a349a9e71aecf93d7d6d7d3e0d93d3e06291a519 [diff] |
am a349a9e7: am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev * commit 'a349a9e71aecf93d7d6d7d3e0d93d3e06291a519':