tree 097fa88bcdb10c041db052a339c97ecfc9e6d063
parent 473bdd53cffa8eb84dadac97d8756d5c6742b9e3
parent b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c
author Paul Lawrence <paullawrence@google.com> 1436301374 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436301374 +0000

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

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