tree 15c0a472ce75e307835e9a25185d842ec6e5aa54
parent cadfe21f5fb89dcce91706a8d063fc9dd27cd57e
parent b489d6c2a1aa80f19394bd61b6bbfad78624d2ca
author Tyler Gunn <tgunn@google.com> 1468274955 +0000
committer android-build-merger <android-build-merger@google.com> 1468274955 +0000

Merge \"Finalize multiendpoint functionality.\" into nyc-mr1-dev
am: b489d6c2a1

Change-Id: Iaf8e0b5957036a7c62a10d77bed86814ea8a67a8