| commit | c1fa34b9f600c827769b4401d8b12e7c587b68f4 | [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 | 8ee286c2164a4a6a8106b21500a336e15c615884 [diff] | |
| parent | d5ef984195779aa9e27d7baabdd751d641eea1a0 [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