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-25 21:13:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-25 21:13:40 +0000
commitc7f1a16c22f1229b8438f1de9763903f0471e74b (patch)
tree0898532177dd9fb108655a05af38d73a5ccab39e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent61d4c3e1957ebe6e4ca3d9bdca0d9a47e8ffe45d (diff)
parent784d0ba513bd4ea6d7d857c237d4c6fceda9f2d9 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e6283fda6d -s ours am: 5304b688a3 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions