| commit | 22d0ee6a25b3bedd6c3cd52473df1404fce8615f | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Jul 06 20:34:05 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 06 20:34:05 2015 +0000 |
| tree | de4056aebbfcf96c5220b516a9ee0dd6c7306570 | |
| parent | 341b607c89649e901bd4b18c201693ce9b7c00a3 [diff] | |
| parent | a65e402b613e927697d35e7936c6d80908d77e88 [diff] |
am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev * commit 'a65e402b613e927697d35e7936c6d80908d77e88': Change init sequence to support file level encryption