| commit | 09ba0da87fa56eac91da5eb2d0a20b7799df66d5 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Oct 15 18:26:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 18:26:59 2014 +0000 |
| tree | 8fd1bf03c295e04c2c132c06b1fd21096b865211 | |
| parent | 01ddc75fc1e9ea28212512299132e9bdace60e05 [diff] | |
| parent | e7c325559d961f13c6df96803bca4747f41b27a4 [diff] |
am e7c32555: Merge "Add a checkbox option to \'require password to decrypt\'" into lmp-dev * commit 'e7c325559d961f13c6df96803bca4747f41b27a4': Add a checkbox option to 'require password to decrypt'