summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-08-24 16:29:02 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-08-24 16:29:02 +0000
commit42eb53372dfd2c283b01df7f1dd247a1fc5d8889 (patch)
treed7e3306190162f388f77ffd1a71ee3e53c7b4013 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parentedb86c3933374caabd3b7d3eac561cc647513eb5 (diff)
parentd561cd2a767b703ce22bea57c901615d7ea98b0c (diff)
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 7175b7b929 -s ours am: f8376b0642 -s ours" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions