| commit | 46bd485611bb336f8dc13c00cc10fcb4995a811f | [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 | 9cfb784a01e615efc8bcacb97313d80d80dcd844 [diff] | |
| parent | 627d85f6825308f868dbd18a3970631d28924abc [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