diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-03 05:28:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-03 05:28:03 +0000 |
| commit | 8e8c07c6ed9f45d243e2325931bb121451111bb5 (patch) | |
| tree | 59e3ae548b3c17480d60b55d6376b3a5ce4a6f15 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b52ded7bfae53fd8566d5d5ae2dbe170d3414334 (diff) | |
| parent | 2a68a8d9ad1471cf418f291eeb9a3e81ceefd745 (diff) | |
Merge changes from topic "am-2cc1b50f-d7fa-4824-840a-51adc851b2fa" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 5d8bb93905
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions