diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-06 02:45:57 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-06 02:45:57 +0000 |
| commit | 8b700c467c7be97ab9f7376fa4a283192f89d717 (patch) | |
| tree | 984add0dbf05af2271d16325b699a8c0ac2c23d5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e998b01b33166a4da6917925482c84ac990fe564 (diff) | |
| parent | 8062f299b1c914f782394a24c6548a5aac595fa8 (diff) | |
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions