tree a31e47ded3c728f22373a7ca2bd9dbb19c255c0e
parent f52972ad8b08310aee9e725f0838d6abdbcd5a2b
parent d70e5d93171e0b771b1d4b2ceff26084a5797e4e
author Tyler Gunn <tgunn@google.com> 1484851190 +0000
committer android-build-merger <android-build-merger@google.com> 1484851190 +0000

Merge "Adding self-managed connection service APIs." am: 3a7253a09d am: 2155be0218
am: d70e5d9317

Change-Id: I20ba841ceefb5905bf81262d6c42ea4b252ba3d4