commit | 4ef9edeb67a1aa25b4ec57b9951b8dc4a06c3691 | [log] [tgz] |
---|---|---|
author | Jason Monk <jmonk@google.com> | Wed Dec 10 21:04:24 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Dec 10 21:04:27 2014 +0000 |
tree | f0a55b85227a135e967f70fd2ec68dfceefc9d77 | |
parent | f441557d89cab8885940bb63a27159f576749f96 [diff] | |
parent | 4a3daac72b327e3f400581541f4044311ce103dc [diff] |
Merge "Handle policy change while keyguard disabled" into lmp-mr1-dev