summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-07-27 15:12:28 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-07-27 15:12:30 +0000
commit5ff22074acdf39aa3e6f714d480b0fedd74d02dc (patch)
tree199829d94c9dcc4e845c5b883c18fa792f3fb784 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent6e14b8774c24d9fa6abbae5e864a03cae4c938a2 (diff)
parent1356b4de249b43f4a715bf0844e9ae77f9a78666 (diff)
Merge "Import translations. DO NOT MERGE am: cdd4f84e06 -s ours am: f3b6338d0f -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions