From: Erik Kline <ek@google.com>
Date: Wed, 11 Jan 2017 08:48:33 +0000 (+0000)
Subject: Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
X-Git-Tag: android-x86-8.1-r1~2121^2~860
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1559d51f86953490eeb51468d16a306de44b3bb9;p=android-x86%2Fframeworks-base.git

Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e
am: 305796276b

Change-Id: Iba225c91bb8b27887805cdba29493c817a969f98
---

1559d51f86953490eeb51468d16a306de44b3bb9