tree d5469ac48c93c969553ccbbec966631a224f72b3
parent ac780c904670f61083f6831bb2d09bc0a15a0bd6
parent 6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332
author Tao Bao <tbao@google.com> 1437111815 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437111815 +0000

am 6e9dda70: uncrypt: Support file level encryption.

* commit '6e9dda70cb00dd1f1948e071d7df7ca6e2bd8332':
  uncrypt: Support file level encryption.