tree a1758f994b7ece31f131e9f4a903b3f5b0c7d0e2
parent 3f6406204c9886ee59209a98e1bb8b64ae615656
parent c69095d8cd9685f9d9c7e3863a5e087efeadba3a
author Tao Bao <tbao@google.com> 1437762802 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437762802 +0000

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

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