diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-21 17:03:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-21 17:03:49 +0000 |
| commit | 99e6aa1b1e77187084f9d19670eba1e513d69b62 (patch) | |
| tree | b6a94ec304ea77c9a170ece46d9d5687d0fc7152 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | abf0ff542a57b19bd83182249475b9bcd3fca2bc (diff) | |
| parent | 4f1f428661fccc7a00259205d762b147835659f6 (diff) | |
Merge changes from topic "am-d326b840-2575-4e69-8ec2-5cfa14046328" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb skipped: ea0127f477
[automerger skipped] Import translations. DO NOT MERGE skipped: f72be588eb
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions