commit | d37f91d18da6e87eb3f2d11dd1cd1645e255cd38 | [log] [tgz] |
---|---|---|
author | Tao Bao <tbao@google.com> | Thu Aug 27 03:38:29 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 03:38:29 2015 +0000 |
tree | 69d6a47242f47951fc81617abee8d63d8b26de93 | |
parent | c73e18f0a433268300cfaa767b06424df71ff63b [diff] | |
parent | f0654b4414c750703f50d4e84319d31d57e86284 [diff] |
am f0654b44: (-s ours) am c69095d8: am afb8f320: Merge "uncrypt: Support file level encryption." * commit 'f0654b4414c750703f50d4e84319d31d57e86284':