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:04:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-18 22:04:02 +0000
commitabb7a328aeb4f2b71d78075bedf0464f51cdeec2 (patch)
treedeb206a7efa6231977dad27724f53ceb613b63bc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentdf742ba4ec31e677781a838bcc9ffbdd528cfc86 (diff)
parent07faa31a1c2daaa5edc64c8fde66195969a11b0d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 465f347c2a -s ours am: dc8467d2b4 -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