tree f1662014f6d158783b3e6d9cf2cceec925781b0c
parent 19a211c14679f18a00c3c1ab14137b054b8c96d4
parent 3cc5148007a7ad2ff0b868ae89c7835286dd148c
author Paul Lawrence <paullawrence@google.com> 1436229127 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436229127 +0000

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

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