tree 69d6a47242f47951fc81617abee8d63d8b26de93
parent c73e18f0a433268300cfaa767b06424df71ff63b
parent f0654b4414c750703f50d4e84319d31d57e86284
author Tao Bao <tbao@google.com> 1440646709 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440646709 +0000

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

* commit 'f0654b4414c750703f50d4e84319d31d57e86284':