commit | 839685bc57d45d98b88e50a896fb7dc9e150cb7e | [log] [tgz] |
---|---|---|
author | Jim Miller <jaggies@google.com> | Wed Oct 15 18:26:02 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 15 18:26:02 2014 +0000 |
tree | 101f9bd0ed57e60196a8263f93618a3b32c2911e | |
parent | 54be1ea752b5d04d914e3c03b61fbfb3ef6b4287 [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'