tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 165c6ad300380fcd132a676f809560a606894e52
parent 7624d0d830ad6b185f0ba50f5ffd8b0e20386228
author Paul Lawrence <paullawrence@google.com> 1440646686 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646686 +0000

am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev

* commit '7624d0d830ad6b185f0ba50f5ffd8b0e20386228':