tree e2eeedfdaa5433e3d3c11fc7cf753cc3f3a0fa5d
parent 62aaba5a3f4cc78f4d7cde9a211da673707fc72e
parent f2574b8206030158b319f96fd78d82840da73194
author Tianjie Xu <xunchang@google.com> 1478912974 +0000
committer android-build-merger <android-build-merger@google.com> 1478912974 +0000

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

Change-Id: I81b174662c620a4af2f7992f37ffd402e92657e7