tree fe534359d765e70560cd5bbee157c2abd74d6de6
parent d1e6d8e643da472f8920781fd0ab285bb8ea970b
parent 1e37be5dd86a51b90e461f09dc8a89effe4aee21
author Tyler Gunn <tgunn@google.com> 1468273980 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1468273982 +0000

Merge "Finalize multiendpoint functionality." into nyc-mr1-dev