summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>2019-07-18 22:09:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-18 22:09:17 +0000
commitfa7dd2d5d35dc41e4898f56500a49927100d19e1 (patch)
treedeb206a7efa6231977dad27724f53ceb613b63bc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent78f815aeb25a27935829e9064a5868e92884dc62 (diff)
parent28333015d658c10578c1ed5c6dd4877aa2cb06ae (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: daeb1bb863 -s ours am: a090c99dd6 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions