| commit | 98066e53ce6d58ae1d01cc5f1882b87f8fbae811 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Jul 13 22:39:08 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 22:39:08 2015 +0000 |
| tree | c950d213c6ee854a657a6b8c7f75a02aced4f6e4 | |
| parent | 52501fcd1688c23c42c43f1d8ae6fa69113a6041 [diff] | |
| parent | 617fcb79a223550ccf142cd4ad7f61fbc1bf37a1 [diff] |
am c1fa34b9: am d5ef9841: Merge "Change init sequence to support file level encryption" into mnc-dr-dev * commit 'c1fa34b9f600c827769b4401d8b12e7c587b68f4': Change init sequence to support file level encryption