| commit | 627d85f6825308f868dbd18a3970631d28924abc | [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 | cfe847a0154388967f5b784572f507e7813eeea2 [diff] | |
| parent | 963f16022464df2df78f907e75ffe9d8b6adf57e [diff] |
am 0a423d99: (-s ours) DO NOT MERGE Securely encrypt the master key * commit '0a423d994a0dbd05924ae6cff702b5d4d7dd43f0': DO NOT MERGE Securely encrypt the master key