tree dddca694a117bb07276073195683a6f4653f910a
parent d6b2b65dc40c5af7feecf634b8ae55bf14fe8e6c
parent 392879eec0ef42155a3f641f1979891d055f923c
author Paul Lawrence <paullawrence@google.com> 1436290139 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1436290142 +0000

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