| commit | fdd45094a0ae7ba70ebf4a7a65c2babb36ae64e3 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Wed Apr 29 16:36:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 16:36:52 2015 +0000 |
| tree | 0c874992373f75c9b58bd0e768a732918ed2e947 | |
| parent | cb16dfc9a87c33c054c8ae0659002e2a96fe435f [diff] | |
| parent | a373d76ef4abf8828c1825b5ef13449a9162e931 [diff] |
am 5feefcbe: Merge "Securely encrypt the master key" * commit '5feefcbedef5a60e385883c8a841c016dc0d0959': Securely encrypt the master key