| commit | 3ac4765a14334f0aa574b5cffb5349cc1c214cfe | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Aug 27 03:38:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:15 2015 +0000 |
| tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
| parent | b3f4921c67bdc3260bfd6274c2ab53d10b53a9c2 [diff] | |
| parent | 1915dd56e3cdc73d4d83453971486b64880e4603 [diff] |
am 1915dd56: (-s ours) am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev * commit '1915dd56e3cdc73d4d83453971486b64880e4603':