tree e2eeedfdaa5433e3d3c11fc7cf753cc3f3a0fa5d
parent 9128e5f85a839282ce890f614670f4b20af793ed
parent 91f736fe1a86f9951b5dc21906b9d8b06dfcf61c
author Tianjie Xu <xunchang@google.com> 1478913423 +0000
committer android-build-merger <android-build-merger@google.com> 1478913423 +0000

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

Change-Id: I43824dc487e506423d3b54638665bd51edf870ed