commit | b6b31549dfe3c9ec6b32e2862ee7e08a949e2f9c | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Tue Jul 07 18:20:23 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 07 18:20:23 2015 +0000 |
tree | 097fa88bcdb10c041db052a339c97ecfc9e6d063 | |
parent | e93fa6b7428a7bdd6386159b417d70090b20f2df [diff] | |
parent | 10cf0942a7f4b2bfd539416e4767aaaf866a6527 [diff] |
am 10cf0942: Merge "Revert "Change init sequence to support file level encryption"" into mnc-dev * commit '10cf0942a7f4b2bfd539416e4767aaaf866a6527': Revert "Change init sequence to support file level encryption"