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