diff options
| author | Hugo Benichi <hugobenichi@google.com> | 2017-08-18 12:14:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-18 12:14:58 +0000 |
| commit | 162cf2b33faa26ff20365d2d5b45f0aef4db44a9 (patch) | |
| tree | c4ef6d0de53f5c76350bbc616d58e30eeacc6ae7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 32e68eae6366482c24220818bbf57a6b0912da17 (diff) | |
| parent | c5b37d1bcf48ef93a1970560f2bac422cb3050b4 (diff) | |
Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" into oc-mr1-dev am: fde112a2eb -s ours
am: c5b37d1bcf -s ours
Change-Id: Ic327ebd95d342411e1b32c1ba6a99142e88bc0a5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions