diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-17 14:17:10 +0000 |
---|---|---|
committer | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-02-17 14:17:10 +0000 |
commit | f4e4f82ab53530f0ee734f198d32ad1dd48d3470 (patch) | |
tree | 58db28268c2507886e48af240d2cabcf125cbaec /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 0e112ad8cc3d47972ea9d564cb5601f54e2ebf47 (diff) | |
parent | edd78e89daaa994f8a7e284d27fdf36602d41124 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 79ffd09927 -s ours am: edd78e89da -s ours
am skip reason: subject contains skip directive
Change-Id: If2d25c81bd0309f328642db7187de10dc72c80e7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions