tree 097fa88bcdb10c041db052a339c97ecfc9e6d063
parent e93fa6b7428a7bdd6386159b417d70090b20f2df
parent 10cf0942a7f4b2bfd539416e4767aaaf866a6527
author Paul Lawrence <paullawrence@google.com> 1436293223 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436293223 +0000

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

* commit '10cf0942a7f4b2bfd539416e4767aaaf866a6527':
  Revert "Change init sequence to support file level encryption"