tree f1662014f6d158783b3e6d9cf2cceec925781b0c
parent 25c0cd38e00f6b891bff3b7f4637e8ac46208021
parent a91335aedcdf1eae07e82bb4f247616832f05928
author Paul Lawrence <paullawrence@google.com> 1436827151 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436827151 +0000

am a91335ae: am 90c75b0b: Change init sequence to support file level encryption

* commit 'a91335aedcdf1eae07e82bb4f247616832f05928':
  Change init sequence to support file level encryption