| commit | 6a5244bcc2603ebabe06fa33817c8481c433e0cf | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Apr 28 19:29:25 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 28 19:29:25 2015 +0000 |
| tree | 149e37fd3d90f996028fcd8a1638fec40533a8d2 | |
| parent | 2306880f07c01f39b9f6f5d3e3aee3e2ca945adf [diff] | |
| parent | 2b3a4939463cb2eb6b65e416f6544a2e2d3bc29b [diff] |
am 2b3a4939: Merge "Revert "Securely encrypt the master key"" * commit '2b3a4939463cb2eb6b65e416f6544a2e2d3bc29b': Revert "Securely encrypt the master key"