tree 16a01adccf89d0bb2a34e39e3e86520b5fc32788
parent 4a0cca600d3073aa061335b227e7023f6066d308
parent 5ffdae08b5c91cc77b1c6964ef32565e188af8d1
author Jerry Zhang <zhangjerry@google.com> 1484854299 +0000
committer android-build-merger <android-build-merger@google.com> 1484854299 +0000

Merge "Keep ScopedEndpointBufferAlloc in variables" am: 1fba0b75b8
am: 5ffdae08b5

Change-Id: I0d1a1105450dc54af6a1e28a4a5eff40900d02c8