| commit | 8b304151fe166742d4641909f125cae05da51d6c | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Jul 07 20:36:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 07 20:36:19 2015 +0000 |
| tree | 96f8e674fc152b9131806ba245b6be3a5677b2d8 | |
| parent | 6055e8d351cd37ff55ebbd8084eaeaec86e72b76 [diff] | |
| parent | f72a4b74e6e603bafc485f0bd1c05175009dc596 [diff] |
am e8308f85: am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev * commit 'e8308f852c867bc676e71875ea57de022464ea09': Revert "Change init sequence to support file level encryption"