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)
commit64c14793f7be91c8b080d2b7de455f193ca0ac5c
tree835550f31fac101b367c26ae94b6921b52a9fd3c
parent2d6209f71de8f88526f97526d40304eef626219a
parent66bc52884b1009fca7917ae89e72e8aa40f394d1
Merge changes from topic "vpn-meteredness" into oc-mr1-dev

* changes:
  DO NOT MERGE: Add unit tests to ensure VPN meteredness
  DO NOT MERGE: Fix ConnectivityController meteredness checks