diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-19 18:46:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-19 18:46:50 +0000 |
| commit | 705bcc8181846455ab9d317475c813a116cd415a (patch) | |
| tree | 47765432f7dea619282c967a2de2acb174306759 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8b6fe1d8948bbd6479387ab1015a306022b55db4 (diff) | |
| parent | ff513c41059c3e199a749be02bdcecc2e7249a60 (diff) | |
Merge changes from topic 'am-2e3c510745c349ef8379b216cc85be0a'
* changes:
Merge changes I1450c126,I8926a922,I54403377,Idf216797 into nyc-mr2-dev am: 85f3996d72 am: 2cb7bad13e
DO NOT MERGE IP Connectivity metrics: add connect() statistics am: 2299a1c401 am: e55546a127 -s ours
DO NOT MERGE Fix IP connectivity metrics tests am: 93c0de0a35 am: 6b480eca3f -s ours
DO NOT MERGE IP connectivity metrics: introduce ConnectStatistics and DNS statistics am: 097bde6c8f am: 3fc3dc2602 -s ours
DO NOT MERGE IP connectivity metrics: add transport field. am: 4c9d3f19cd am: 66346ab78c -s ours
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions