tree 705bd187e5db0ed3aa5a55bb7340f38ea83ea2a6
parent 129f538a371891cc6bf5667dfa1525d1047f4ce8
parent 778cb7ec1695002cb5f2c6f0b65a71a22c0fbc59
author Cosmos Nicolaou <cnicolaou@google.com> 1410457894 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1410457895 +0000

Merge "veyron2/ipc: reworked ListenX API to support roaming, non-roaming and proxy."