OSDN Git Service

Merge changes from topic "vpn-meteredness" into oc-mr1-dev
authorBenedict Wong <benedictwong@google.com>
Wed, 30 May 2018 23:00:13 +0000 (23:00 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 May 2018 23:00:13 +0000 (23:00 +0000)
* changes:
  DO NOT MERGE: Add unit tests to ensure VPN meteredness
  DO NOT MERGE: Fix ConnectivityController meteredness checks


Trivial merge