OSDN Git Service

am efd93b16: Merge "Securely encrypt the master key"
authorPaul Lawrence <paullawrence@google.com>
Wed, 29 Apr 2015 17:00:52 +0000 (17:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Apr 2015 17:00:52 +0000 (17:00 +0000)
commitc3cc55557a4ead4a80afdcf437322499728ce8eb
treec1dd0f0fead5d8633d4e36bda845826a4f24abbf
parent909c7fab49772a66e2c8c52337d78237202d509f
parentefd93b16b36d2aecc994c282317f37729bab7357
am efd93b16: Merge "Securely encrypt the master key"

* commit 'efd93b16b36d2aecc994c282317f37729bab7357':
  Securely encrypt the master key