| commit | a349a9e71aecf93d7d6d7d3e0d93d3e06291a519 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Dec 11 00:06:53 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 11 00:06:53 2014 +0000 |
| tree | b305b738170ccc76c3b1d6d2b7a2c944d79161e4 | |
| parent | 5369b76963a344d08fda4532227a6f0da28fd23a [diff] | |
| parent | 65c08ec82a11eeb2ea8b048935ddafc694fc0236 [diff] |
am 65c08ec8: am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev * commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236': Handle policy change while keyguard disabled