diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:56:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:56:27 +0000 |
| commit | fba72fae752b1c310d5b4635026846c695c624a9 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e52b535542ef1e0299fc77da8d1426dac17ae31e (diff) | |
| parent | ebf972a5bb4d0c245bc682b643d794b7fc27d9b6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b3ea91190e -s ours am: 6ab87158b5 -s ours am: eb4a9ae37b -s ours am: 30e108fe59 -s ours am: ebf972a5bb -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420408
Change-Id: I13419a07e523ca0fcf3d222c748d21ad36a7609b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions