tree 61db93336fd9a709d631284221007d667586ac6c
parent af2359fdc4a45fcf482d1a316bae1fff226c425b
author Paul Lawrence <paullawrence@google.com> 1430248558 +0000
committer Paul Lawrence <paullawrence@google.com> 1430248558 +0000

Revert "Securely encrypt the master key"

This reverts commit af2359fdc4a45fcf482d1a316bae1fff226c425b.

Change-Id: Icd4d04adf5c0728357caa6eb225b9a08fd0ad552