| commit | e7767f0e00ef6e5413ca3628336ff5ddc76165e0 | [log] [tgz] |
|---|---|---|
| author | Paul Lawrence <paullawrence@google.com> | Thu Aug 27 14:13:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:13:40 2015 +0000 |
| tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
| parent | d3982955c68200e4105044ab04ef620c2860b0b2 [diff] | |
| parent | 04d9b8501a58de6ee7c5aa3635673150bf88cb06 [diff] |
am 04d9b850: am 7624d0d8: (-s ours) am d6b2b65d: Merge "Change init sequence to support file level encryption" into mnc-dev * commit '04d9b8501a58de6ee7c5aa3635673150bf88cb06':