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-26 18:03:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-07-26 18:03:45 +0000
commit5c0b9dd1470b07a8e1d9c683eb19abee47de98e9 (patch)
treef89369aa44b2c3511681fe52bfa03a3deda49939 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentcff43892cefcd34daf2e873e4f987606358ad460 (diff)
parentb5a1462941f2963b44ce113d922ae18a6ade3cc8 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 55a5388280 -s ours am: 8237048fb0 -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