tree e20c2c74c9f7e3915e672f90a2100e084ccf0696
parent a5538b87e8b81b07e19a16de8f3ba41db669cd66
parent 7ceff3e0030cd635f6b67153494df653c8bff3e5
author Tianjie Xu <xunchang@google.com> 1478911756 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1478911756 +0000

Merge "Allow uncrypt to work without socket communication"