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