diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 07:03:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 07:03:14 +0000 |
| commit | bc7d031472967b8cbcbbf1d49b276515e6a68a0c (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a5be4dd6fab55d8fb0c77ca16da5fde33af24332 (diff) | |
| parent | 1da5b2d44c5944d70d97b007630d19834bd1a39b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f3a7728fb9 -s ours am: 9cbec70a10 -s ours am: 8a48949a09 -s ours am: 1da5b2d44c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420409
Change-Id: I6ec18589411f93c4fcde8db7c9d296487c236cea
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions