OSDN Git Service

Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
authorErik Kline <ek@google.com>
Wed, 11 Jan 2017 08:42:55 +0000 (08:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 08:42:55 +0000 (08:42 +0000)
commit305796276bfea9e5a7b24da9fbcc53723bf7a4f5
tree0f5b5292b28beb7935b5d86181207e336f26a1f5
parente4cff360995579639d952576e8db137a6fe6d085
parentd48902d37e5ae8ef08ac3923f52bf1e027ffff08
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76
am: d48902d37e

Change-Id: Ia3c21d905c5f4eaa1dd0ea09f3113989e9d8eecc