tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent 9f012cd7a658c6c236f722c7020befdccf666ac9
parent d37f91d18da6e87eb3f2d11dd1cd1645e255cd38
author Tao Bao <tbao@google.com> 1440684829 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684829 +0000

am d37f91d1: am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."

* commit 'd37f91d18da6e87eb3f2d11dd1cd1645e255cd38':