OSDN Git Service

Merge "Securely encrypt the master key"
authorPaul Lawrence <paullawrence@google.com>
Wed, 29 Apr 2015 16:24:38 +0000 (16:24 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 29 Apr 2015 16:24:38 +0000 (16:24 +0000)

Trivial merge