| commit | 184c8d93434d8f79e073a619843538ae8f91fe12 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Mon Jul 13 16:55:53 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jul 13 16:56:02 2015 +0000 |
| tree | 780c6a29669e3de4c81da2a8df7adbc6ed145534 | |
| parent | c5b323adb8d4a7f44b114bffe67402575d6a36a7 [diff] | |
| parent | 35aef24312281de45ff6111d87dee1f37cc331a1 [diff] |
Merge "Change init sequence to support file level encryption" into mnc-dr-dev