OSDN Git Service

Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
authorErik Kline <ek@google.com>
Wed, 11 Jan 2017 08:48:33 +0000 (08:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 08:48:33 +0000 (08:48 +0000)
am: 305796276b

Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98


Trivial merge