summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-29 22:36:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-29 22:36:14 +0000
commit21a34411616a968150ea2dc0ab09ecc8810b94ab (patch)
tree1e1375194bfde54669ede8a04e54b472417112a6 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent35ea834c58788538cd4b1ca5f03f258f48f813ae (diff)
parent5b12be15622005500732b1a42becd407e51e7608 (diff)
Merge "[automerger skipped] Merge "Do not set referrerUri on SessionInfo for non-owners" into qt-qpr1-dev am: 190cf66184 -s ours am: f894ada560 -s ours am: bdda889b15 -s ours am: 92ffd8ab34 -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions