tree 3a02b204e967358c432da780014db9c65f8d8588
parent 55d3eb0afd17474f5f59c58aa880e147c0cf9510
parent 9234b169e62b10e38ecd3dc636ccccb425ea4eed
author Paul Lawrence <paullawrence@google.com> 1430166316 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430166316 +0000

am 9234b169: Merge "Securely encrypt the master key"

* commit '9234b169e62b10e38ecd3dc636ccccb425ea4eed':
  Securely encrypt the master key