diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-01 05:44:56 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-01 05:44:56 +0000 |
| commit | 976625d9c19e41c81eb1194b25b12d471c784b13 (patch) | |
| tree | 9cd42bfee4870206f683ca07fe30ed9a64180c1f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a72a6996bba0d929448c1f1aceeb97b8ea4ed77a (diff) | |
| parent | 853c7ca3a515f8e501cea9bb6e2874f8481c6dab (diff) | |
Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into nyc-mr2-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions