diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-11 18:11:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-11 18:11:29 +0000 |
| commit | 836d1db23982975f7850abd944ae59b1af0b7393 (patch) | |
| tree | d3581ecd99795b9f13256fb98048409766275feb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3bbe3c7c93814bbbb9f2bf10014a3f1e4b3c185f (diff) | |
| parent | 6d301239999fdbd02b57a9e9fafb67e6080d5de3 (diff) | |
Merge changes from topic "am-8eb97afa-063a-44e2-8d8e-6d5670eb50b6" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8 skipped: c6a1d32ebe
[automerger skipped] Import translations. DO NOT MERGE skipped: 5e25fd88a8
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions