| commit | ce711c6d57732c3582da0828c0361f55381f4223 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Oct 15 18:31:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 18:31:32 2014 +0000 |
| tree | 30767686513c8864a1046af5de9c5ccd626d15cd | |
| parent | 5c8cafa6143858f725dd1bb73da7ac9f8d8f8f5f [diff] | |
| parent | 09ba0da87fa56eac91da5eb2d0a20b7799df66d5 [diff] |
am 09ba0da8: am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev * commit '09ba0da87fa56eac91da5eb2d0a20b7799df66d5': Add a checkbox option to 'require password to decrypt'