| commit | 617fcb79a223550ccf142cd4ad7f61fbc1bf37a1 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Jul 13 17:53:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 17:53:08 2015 +0000 |
| tree | 1923b4982ffea244df4617f00a49dc14c567f37b | |
| parent | 5354b0572591e42b1b606804e191863441fe0ccb [diff] | |
| parent | 184c8d93434d8f79e073a619843538ae8f91fe12 [diff] |
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