diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2016-12-08 17:26:33 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-08 17:26:37 +0000 |
commit | 5a8f26382ff2aa7c2734ef24c337fe17a34d7c0b (patch) | |
tree | b433d1c18a264fd5bd574f2d008797993077738d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 738dddae728bd1bdbf4629731f7d2ee7365316e6 (diff) | |
parent | 174ba61ad90106184abe8bafb874452fbb164876 (diff) |
Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions