| commit | f72a4b74e6e603bafc485f0bd1c05175009dc596 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Jul 07 18:20:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 07 18:20:27 2015 +0000 |
| tree | d9099c2d381064f329af5af00c74bdb512a24d32 | |
| parent | c16821cf255f2c012e7f36716d884136cbf83212 [diff] | |
| parent | f192c5cc526e9ee646266d5cbb29efb612f62e64 [diff] |
am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev * commit '8104616696ac5e806b16a393ea02c4f5d8efc328': Revert "Change init sequence to support file level encryption"