OSDN Git Service

Merge changes from topic 'framework-net-aosp'
authorTreehugger Robot <treehugger-gerrit@google.com>
Fri, 9 Dec 2016 03:19:13 +0000 (03:19 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 9 Dec 2016 03:19:13 +0000 (03:19 +0000)
commit25afce88a6f28d612fbd1f3c6905a375d11d51e4
tree19c68d160853dc500200d1952cbe7a0539954d02
parenta8c2c229d734cc5c94aafcdaea06824bcb668c2c
parentf99a33a1b4599f6297faa316f408b58deebabefb
Merge changes from topic 'framework-net-aosp'

* changes:
  DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents
  DO NOT MERGE: TokenBucket for rate-limiting and throttling
  DO NOT MERGE: IpConnectivityMetrics reads buffer size in settings
  DO NOT MERGE: CaptivePortalLogin: set mixed content policy to compatibility.
  DO NOT MERGE: Add IP conn metrics to dumpsys and bug reports
  DO NOT MERGE: IpConnectivity metrics: add version number