tree b9dddc54c9c00f4d3e7dd35a35ec797ea6a5a567
parent 25aabb9edeb9203e52758d307b8a94ec8c64d338
parent d815178b7512cb44d8b5f234e3f823b5a3e44dea
author Paul Lawrence <paullawrence@google.com> 1436211207 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436211210 +0000

Merge "Change init sequence to support file level encryption" into mnc-dev