diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:30:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-03 22:30:21 +0000 |
| commit | 7e78fc9489352ba647efd49300c3c830d14b6fff (patch) | |
| tree | d5c8d439c46350ac2473f44d7d7e9acb1ea66a1d /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 537b917fb916e9a37344dc90427b0353ab4c9fd8 (diff) | |
| parent | f886beded5508c15661302fbef165355b47491d0 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: dd2e7d498d -s ours am: 45e1c0131b -s ours" into rvc-qpr-dev-plus-aosp am: f886beded5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12295622
Change-Id: Ieddf3b4c06ca6ec5bd80ebb1976310b8093f5c83
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions