tree b47ebffc84ddb303c0993a4f2a13e2f2d5f9f2cf
parent ec9fdfee2fbded53f7245bcb174a0c8dc059e61d
parent 28c1e5d3aa9610db6e141380b1435937fc7f07db
author Tianjie Xu <xunchang@google.com> 1468004625 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468004625 +0000

Merge "Allow uncrypt to work without socket communication"