commit | d000400638282605d09341e92015e58c8067f33b | [log] [tgz] |
---|---|---|
author | Paul Lawrence <paullawrence@google.com> | Tue Jul 07 00:32:17 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 07 00:32:17 2015 +0000 |
tree | dd44eb9a0f56cf27d180123aa4eae1baac624601 | |
parent | 3c77182fc61c33a6f24a9a00a39716f416498857 [diff] | |
parent | fcc23b7b60ceb3e81533516ffa8f53d9d3b13a6e [diff] |
am 22d0ee6a: am a65e402b: Merge "Change init sequence to support file level encryption" into mnc-dev * commit '22d0ee6a25b3bedd6c3cd52473df1404fce8615f': Change init sequence to support file level encryption