| commit | 09757a10989163927576ab6cbfc58eeef7786854 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Tue Jul 07 17:39:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 07 17:39:03 2015 +0000 |
| tree | d9099c2d381064f329af5af00c74bdb512a24d32 | |
| parent | 8df4864deb0ba592057727e547a5737f223c5d57 [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"