| commit | e64b8533798f5904fc353d8fec0d41c5bf0d90f0 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Aug 27 11:36:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:36:36 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | d5e6bdf62fbf2892592eb170f5e9c9a5e31812ef [diff] | |
| parent | 0b2b1bf44e51569245d3d4a906c7bf6cf8325d1e [diff] |
am d3669ff2: (-s ours) am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev * commit 'd3669ff27f782ce1da324f0a6043204a3a4e9f3f':