| commit | e7c325559d961f13c6df96803bca4747f41b27a4 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Wed Oct 15 18:21:50 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Oct 15 18:21:52 2014 +0000 |
| tree | 72d8e56a2ee86f31cb6f2beab45bf3c446276782 | |
| parent | 2c3886cb3463ff39c1986c5b85eba79748dd8c24 [diff] | |
| parent | 6848dc8e3b54fb27047836d8026c4c9971754607 [diff] |
Merge "Add a checkbox option to 'require password to decrypt'" into lmp-dev