tree 06938b7e126c084683f65034f9b0b36cbbe39856
parent 118e814bfeae5f761255dd34577b8865ac6d28d1
parent 4c1f3eda98b2c0fde45f71de4fdcea2a46a67cbd
author Tianjie Xu <xunchang@google.com> 1478912553 +0000
committer android-build-merger <android-build-merger@google.com> 1478912553 +0000

Merge "Allow uncrypt to work without socket communication"
am: 4c1f3eda98

Change-Id: I8e86d4201d2fac0293e70df54e0816c96e85a9b7