diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-12-09 03:19:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-09 03:19:13 +0000 |
| commit | 25afce88a6f28d612fbd1f3c6905a375d11d51e4 (patch) | |
| tree | 19c68d160853dc500200d1952cbe7a0539954d02 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a8c2c229d734cc5c94aafcdaea06824bcb668c2c (diff) | |
| parent | f99a33a1b4599f6297faa316f408b58deebabefb (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
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions