commit | a57e3200f2caca1ce7f433c8bf3eee71d6c5c8f2 | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Mon Jun 01 17:35:32 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:35:32 2015 +0000 |
tree | 3e0b00aa7b05c71d5f511ab9c56ce1b5981c4798 | |
parent | dde4b19ce1ea87843b30001ba5c648e2ed39081e [diff] | |
parent | e52a854a8de88bf3c35de8f9cd25694efd3e4cbd [diff] |
am e52a854a: (-s ours) am 0a423d99: (-s ours) DO NOT MERGE Securely encrypt the master key * commit 'e52a854a8de88bf3c35de8f9cd25694efd3e4cbd': DO NOT MERGE Securely encrypt the master key