tree 77e6d2791ba832b1ddda0ff43ce5e6d232bbc7e5
parent 7665d443e2e3de775661068c29df38581476cc71
parent c69095d8cd9685f9d9c7e3863a5e087efeadba3a
author Tao Bao <tbao@google.com> 1437771770 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437771770 +0000

am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption."

* commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a':
  uncrypt: Support file level encryption.