tree 1923b4982ffea244df4617f00a49dc14c567f37b
parent 5354b0572591e42b1b606804e191863441fe0ccb
parent 184c8d93434d8f79e073a619843538ae8f91fe12
author Paul Lawrence <paullawrence@google.com> 1436809988 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436809988 +0000

am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev

* commit 'd5ef984195779aa9e27d7baabdd751d641eea1a0':
  Change init sequence to support file level encryption