diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:35:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:35:59 +0000 |
| commit | e52b535542ef1e0299fc77da8d1426dac17ae31e (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3c3439b1eb9c2775bda2d3397f2d8c2d4956cc84 (diff) | |
| parent | 487c6b6139818179519f1976b661c7c7f4188214 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d3d24c10d5 -s ours am: 0d88970647 -s ours am: 18dee2278c -s ours am: e6b2706bfd -s ours am: 487c6b6139 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420253
Change-Id: I21a01b78228601f839e385c69e4421b2eff32688
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions