tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent b3f4921c67bdc3260bfd6274c2ab53d10b53a9c2
parent 1915dd56e3cdc73d4d83453971486b64880e4603
author Paul Lawrence <paullawrence@google.com> 1440646695 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646695 +0000

am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev

* commit '1915dd56e3cdc73d4d83453971486b64880e4603':