tree f1662014f6d158783b3e6d9cf2cceec925781b0c
parent 08b63396f9a2361a891f37831e20fda502b2afa4
parent d6b2b65dc40c5af7feecf634b8ae55bf14fe8e6c
author Paul Lawrence <paullawrence@google.com> 1436214140 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436214140 +0000

am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev

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