| commit | 72fad66f0a1acf5d8f2e965613b39b7f506c594c | [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 | 55d3eb0afd17474f5f59c58aa880e147c0cf9510 [diff] | |
| parent | 9234b169e62b10e38ecd3dc636ccccb425ea4eed [diff] |
am 9234b169: Merge "Securely encrypt the master key" * commit '9234b169e62b10e38ecd3dc636ccccb425ea4eed': Securely encrypt the master key