tree 30e81239f6af783dd9eb966061366a152a71508f
parent 7053e9cd5ebbbb783bf4140381090e6bd0caa740
author Paul Lawrence <paullawrence@google.com> 1430248606 +0000
committer Paul Lawrence <paullawrence@google.com> 1430248606 +0000

Revert "Securely encrypt the master key"

This reverts commit 7053e9cd5ebbbb783bf4140381090e6bd0caa740.

Change-Id: I77ed4dbdff8643c80629d2126cb29f85c24c7b43