tree 0c874992373f75c9b58bd0e768a732918ed2e947
parent ccb8abf5de28edd4325ff201dfd471bf91d032fe
parent 5feefcbedef5a60e385883c8a841c016dc0d0959
author Paul Lawrence <paullawrence@google.com> 1430325412 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430325412 +0000

am 5feefcbe: Merge "Securely encrypt the master key"

* commit '5feefcbedef5a60e385883c8a841c016dc0d0959':
  Securely encrypt the master key