| commit | 2fe6a631c62fb4dc627910692e08d5c8c1f4d2ac | [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 | ccb8abf5de28edd4325ff201dfd471bf91d032fe [diff] | |
| parent | 5feefcbedef5a60e385883c8a841c016dc0d0959 [diff] |
am 5feefcbe: Merge "Securely encrypt the master key" * commit '5feefcbedef5a60e385883c8a841c016dc0d0959': Securely encrypt the master key