| commit | 38417fda7f01f4c70eb38e250043e9d677579eeb | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Aug 27 11:36:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:36:49 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | bf569057777885afe5bdcac2f57ba12237774306 [diff] | |
| parent | 09757a10989163927576ab6cbfc58eeef7786854 [diff] |
am c011b031: (-s ours) am 81046166: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev * commit 'c011b031c988038f81c72875fdd6ac7349774f35':