OSDN Git Service

Merge "Separate NetworkMonitor/framework portal URL" am: bcd3bed561 am: 34198fac89
authorRemi NGUYEN VAN <reminv@google.com>
Mon, 25 Mar 2019 03:23:39 +0000 (20:23 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Mar 2019 03:23:39 +0000 (20:23 -0700)
commit516d750ae20bc420583bba71d76319d616c664a5
tree43aac20e5a28bc7882c1108d0a8c073c7963f4f5
parent1bf2ef3bc3a503573dafa7b139288223b6618fbf
parent4d975feb9f6636942a0bdaf31b3a8a33ab821e53
Merge "Separate NetworkMonitor/framework portal URL" am: bcd3bed561 am: 34198fac89
am: 4d975feb9f

Change-Id: I85e744d94d96ecf9ac558e62016418d8199bb98c
core/res/res/values/config.xml
core/res/res/values/symbols.xml
services/core/java/com/android/server/ConnectivityService.java