diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 16:40:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 16:40:51 +0000 |
| commit | 3ae6cbf5438c233c89468435b2db42429b146ede (patch) | |
| tree | c9ef8d72b4bea2b6a1d79039191ec204e063f61c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f689459e4e20335898d83be3b25e0273797a697c (diff) | |
| parent | e6036458fead056cf0eba6405761f1338d738762 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 94fbf790d7 -s ours" into rvc-dev-plus-aosp am: ba9c2ecfd5 -s ours am: edfdc8b716 -s ours am: e6036458fe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: I6e10d2f36c707ef0438e673a027d9a38768097d2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions