diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 16:12:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-03 16:12:12 +0000 |
| commit | e6036458fead056cf0eba6405761f1338d738762 (patch) | |
| tree | 57be1ad2940bea96cc0aedc52258b0a8e20f4c6e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c418cfe3955f2f7512f302137e6ddb1e7203580b (diff) | |
| parent | edfdc8b716c7729e5d2fbf189f03e46f69c6fe53 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12515250
Change-Id: If335fb0237a1c82b821040f3c9c876701fb14594
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions