diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2016-12-19 08:31:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-19 08:31:17 +0000 |
| commit | 85f3996d72a55f98bd773a01b26ff4249e9bb644 (patch) | |
| tree | d21b4a5d96a40772ab76b8e95c0a2dc874b01064 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 05d36569b6c2c809fba456e1000e5bcfde0440ff (diff) | |
| parent | 2299a1c4015ac786f49302ad26a586a39a5ba6a1 (diff) | |
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev
* changes:
DO NOT MERGE IP Connectivity metrics: add connect() statistics
DO NOT MERGE Fix IP connectivity metrics tests
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics
DO NOT MERGE IP connectivity metrics: add transport field.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions