tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 081408da869d24b346ef8f10f587ba7e8f035cf3
parent 3ac4765a14334f0aa574b5cffb5349cc1c214cfe
author Paul Lawrence <paullawrence@google.com> 1440684823 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684823 +0000

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

* commit '3ac4765a14334f0aa574b5cffb5349cc1c214cfe':