| commit | 9c8e68726d3c054d6efc1bf6589489ecfc36c6f3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Dec 09 03:19:13 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Dec 09 03:19:13 2016 +0000 |
| tree | 94bf4072a2524fa3d81b66f634751d14b4fc6109 | |
| parent | 69e6a108a576738025d43a632e4632721e02f984 [diff] | |
| parent | f2de19cb5cb45717cfb98f1c1c56f9ec8a04ab19 [diff] |
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