OSDN Git Service

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

Trivial merge