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