tree e33ba32027becb515a5d9c1806c545c0bc84d0c2
parent 87f2c673dfbc310d1a80ea1c3b00d9e1adb1947f
parent afb8f320bf244630035e011f7840f90120ec4f8f
author Tao Bao <tbao@google.com> 1437761922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437761922 +0000

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

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