tree dddca694a117bb07276073195683a6f4653f910a
parent 0d2c08336215c1a710bb4d0cd71aadfb6c7d6622
author Paul Lawrence <paullawrence@google.com> 1436288739 +0000
committer The Android Automerger <android-build@google.com> 1436303056 -0700

Revert "Change init sequence to support file level encryption"

This reverts commit 98c1a3de23ae8b589c36e74939193c44d25cac65.

Change-Id: I524060418de18f97c3865ebc4435f501015e92ee