tree 30b3ab32584fe87b5b48f64b90c2e9405811e402
parent e482d3a819edb60038ba5c4ca7f33935b27dd35f
parent d2fab7e46357c99991f08c9d0dbc05f5bbb3f6aa
author Jerry Zhang <zhangjerry@google.com> 1484854570 +0000
committer android-build-merger <android-build-merger@google.com> 1484854570 +0000

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

Change-Id: I9218cc1bcd25bd00975413e1c2b6bd75ce49eb36