OSDN Git Service

am e73da0cd: Merge "Securely encrypt the master key"
authorPaul Lawrence <paullawrence@google.com>
Mon, 27 Apr 2015 21:48:52 +0000 (21:48 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Apr 2015 21:48:52 +0000 (21:48 +0000)
commit117618870f887ff16b8bd0685f759e84a1e6b2aa
tree9dff4b182e0d6c0efc071c55419f069efb62827d
parent4b3cc6e83c09214a030ee587f35e65531830c8ee
parente73da0cdaa154b5cd0c2f10cb2d1f9b9dd171900
am e73da0cd: Merge "Securely encrypt the master key"

* commit 'e73da0cdaa154b5cd0c2f10cb2d1f9b9dd171900':
  Securely encrypt the master key
ext4_utils/Android.mk