tree 20440ee4d64ea1b58bd2a5adf8d542cc48a9e72e
parent ab9dd7b1456d4bdd95763c9b9d51debf27a5ff16
parent d6f8931276aee952ff1fee4e3268a1422b0a0162
author Tyler Gunn <tgunn@google.com> 1471372332 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1471372332 +0000

Merge "Handle connection events from the original connection." into nyc-mr1-dev