summaryrefslogtreecommitdiff
path: root/rs/java/android/renderscript/ProgramFragmentFixedFunction.java
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-05-27 03:29:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-05-27 03:29:09 +0000
commitd5eb34ad35d5a95095a2fce794e7680c0e7c58a7 (patch)
treec83314e373b0164dfdccfc8d6ca53d466c7d8473 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java
parent902c693bae6c3f432dd72f3b55680e13632bf928 (diff)
parenta308faaa66fbac44ad63d68d9cac511869f451b4 (diff)
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 9f2ffbcd66 -s ours" into nyc-mr1-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions