OSDN Git Service

Merge "Revert "Securely encrypt the master key""
authorPaul Lawrence <paullawrence@google.com>
Tue, 28 Apr 2015 19:16:07 +0000 (19:16 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 28 Apr 2015 19:16:08 +0000 (19:16 +0000)
commitb0d1872803e2527a501d74b7afa518148414f1fb
tree6f0c661584e8164a0dcb06d80870cd637ea23a75
parent21e720a8bde20f6255d51f9183ba90f01457fdd3
parentea2ec8875c9b024613d3ec5270bca6247c06d6bd
Merge "Revert "Securely encrypt the master key""