OSDN Git Service

Merge changes I6779a835,I4e3d8322
authorLorenzo Colitti <lorenzo@google.com>
Mon, 3 Jul 2017 01:49:28 +0000 (01:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jul 2017 01:49:28 +0000 (01:49 +0000)
commit3b3f420481a7d5532b13c8ff1cdbc476247959a9
treea091aa14edef287afda4cbb6d8f119aae3dbd825
parent6a2fcae638f6e0852d8da882f6fdf59c0ea760ac
parent1fbe96248220008984794326887a8eae42540641
Merge changes I6779a835,I4e3d8322
am: 1fbe962482

Change-Id: I99af01094a2e1d905f47b12822a036a1de6e3611
services/core/java/com/android/server/connectivity/NetworkMonitor.java