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-05-22 12:34:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-22 12:34:15 +0000
commitc9e7c9603c20838a00511bf25f57ca3d0ca25243 (patch)
tree14ce77591432911b53f5f6a93ac2ff0eceb31be9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentea2e73115ce70fc328844b2f15b11cdc135c691d (diff)
parent3b2047f30ad29a09e0f6a2a5e38006aa25829b3d (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e2529357e8 -s ours am: fa3da95195 -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