OSDN Git Service

am bc2eb8c3: (-s ours) DO NOT MERGE Securely encrypt the master key
authorPaul Lawrence <paullawrence@google.com>
Fri, 29 May 2015 21:02:36 +0000 (21:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 May 2015 21:02:36 +0000 (21:02 +0000)
commit3e1b7b1e390b1f65d3eb2e957502ad00cd6a2fe6
treed5cdfc0d4e519ca8f90026fb8889e191136935e5
parent83a45f3e342ee0d4e525bf6b2a8af4b618d90fc8
parentbc2eb8c3fd621605ff1ccaed04a71e6685acc974
am bc2eb8c3: (-s ours) DO NOT MERGE Securely encrypt the master key

* commit 'bc2eb8c3fd621605ff1ccaed04a71e6685acc974':
  DO NOT MERGE Securely encrypt the master key