Varun Anand 8af90ce15b Merge changes from topic "vpn_data_accnt_revert" ...

* changes:
  Revert "Take all VPN underlying networks into account when migrating traffic for"
  Revert "NetworkStatsService: Fix getDetailedUidStats to take VPNs into account."
  Revert "Addressing comments for http://ag/7700679."
  Revert "Add one more test for VPN usage stats."

2019-06-12 01:05:01 +00:00

..

java

Merge changes from topic "vpn_data_accnt_revert"

2019-06-12 01:05:01 +00:00

jni

Reconcile binder JNI with earlier changes, removing lock.

2019-06-06 11:17:59 +02:00

proto

Extend NetworkDnsEventReported and add new DnsCallReported to log per-query information

2019-05-03 16:13:12 +08:00

res

Merge "Extend the service configuration for the binding service."

2019-06-06 17:51:54 +00:00

tests

Revert "Take all VPN underlying networks into account when migrating traffic for"

2019-06-10 16:00:48 -07:00

xsd

Merge "Add Vts test for xsd_config"

2019-04-05 06:50:43 +00:00