commit | 8749d238bffe1e272695221f14f481acb15650b6 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Fri Jul 24 20:33:22 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 20:33:22 2015 +0000 |
tree | 9afd779a06fddad908541f1ee53c727c800c4b5a | |
parent | a6b3c540ad2cbab1be206289218db1fcb31948f6 [diff] | |
parent | e657f0fb8ec21b09831ed19d18ba05a7630a4fb0 [diff] |
am e657f0fb: am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." * commit 'e657f0fb8ec21b09831ed19d18ba05a7630a4fb0': uncrypt: Support file level encryption.