diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-13 23:02:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:02:33 +0000 |
| commit | 2f4d9ccd078289b9882ba029c09d0a1c09ace157 (patch) | |
| tree | 7be7aa2003a01063b2c1551828eb8091a414c1ed /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3eb5eb0016f6f32f5ba24d99fed2e42b85509e8e (diff) | |
| parent | 403f941afb7dcfb1770bca610f92d24bff4cee89 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a0d9ef7e -s ours am: 2e0c1a0555 -s ours am: 403f941afb -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15543339
Change-Id: I298ffef905664b011f97455084487917c16a8a37
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
