tree d5469ac48c93c969553ccbbec966631a224f72b3
parent a51708dfbe4decdb28f6bca04785c20b5e8b1f75
parent f2c4e4ce767103603cdc6137339f013af3dc1ad1
author Tao Bao <tbao@google.com> 1437112207 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437112207 +0000

am f2c4e4ce: am 6e9dda70: uncrypt: Support file level encryption.

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