| commit | 3b4ccabc06578a70adb2c0c748ded0410b26a763 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Dec 11 00:06:21 2014 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 11 00:06:21 2014 +0000 |
| tree | b305b738170ccc76c3b1d6d2b7a2c944d79161e4 | |
| parent | 5369b76963a344d08fda4532227a6f0da28fd23a [diff] | |
| parent | 65c08ec82a11eeb2ea8b048935ddafc694fc0236 [diff] |
am 4ef9edeb: Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev automerge: 65c08ec * commit '65c08ec82a11eeb2ea8b048935ddafc694fc0236': Handle policy change while keyguard disabled