tree f1662014f6d158783b3e6d9cf2cceec925781b0c
parent 79e95b2d167becd93e7c456e5aa0c482edaeefcc
parent 90c75b0beb375b8d261e2df92292e9b542470f6e
author Paul Lawrence <paullawrence@google.com> 1436809994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436809994 +0000

am 90c75b0b: Change init sequence to support file level encryption

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