diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-06 02:50:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-06 02:50:29 +0000 |
| commit | e906e8a9cf10838255c082a97579ddf96b1da88d (patch) | |
| tree | 984add0dbf05af2271d16325b699a8c0ac2c23d5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e80af8d1e5c12de876b0e6bd084fed7c18f0aded (diff) | |
| parent | 39c48a11680b16f0f1b1e16fefbe46230d165e54 (diff) | |
Merge changes from topic "am-8b8b3d01-a327-4923-ae09-35940a00b1b3" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: e35f1fdbae
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions