commit | f0654b4414c750703f50d4e84319d31d57e86284 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Fri Jul 24 21:02:50 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 21:02:50 2015 +0000 |
tree | 77e6d2791ba832b1ddda0ff43ce5e6d232bbc7e5 | |
parent | 7665d443e2e3de775661068c29df38581476cc71 [diff] | |
parent | c69095d8cd9685f9d9c7e3863a5e087efeadba3a [diff] |
am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." * commit 'c69095d8cd9685f9d9c7e3863a5e087efeadba3a': uncrypt: Support file level encryption.