| commit | 8db6069b43c107cb3585743758659e20f46dfd6f | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Apr 27 20:25:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 27 20:25:16 2015 +0000 |
| tree | 3a02b204e967358c432da780014db9c65f8d8588 | |
| parent | d660e48abf8a19d7e06ccd23460cb41318eb5358 [diff] | |
| parent | 46881b29c2e718ac945814a347361aa225c02ee4 [diff] |
am 9234b169: Merge "Securely encrypt the master key" * commit '9234b169e62b10e38ecd3dc636ccccb425ea4eed': Securely encrypt the master key