diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 08:36:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 08:36:09 +0000 |
| commit | 1842ed0a4f80fe8f65754180ee76a13bc47342b6 (patch) | |
| tree | 999271e5acef206d196c847b6808bb14cb144d23 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b4e0a2f9b47604eb599d65da28dbe552c3044f17 (diff) | |
| parent | cbc7b55c3d3e11f42f778b129b30a3ca308c5284 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a37e4c6327 -s ours am: e2f78c8a82 -s ours am: c52327b714 -s ours am: cbc7b55c3d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419991
Change-Id: I1ad5c9b0f3b0dd1898a3f725672100fc22ac0699
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions