diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 06:06:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 06:06:34 +0000 |
| commit | 58dd09c7eabd3f424cc7a7080316c1efdf5ab017 (patch) | |
| tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 343548071ec262ee3bd58f2eb138d78ccadd280e (diff) | |
| parent | 0cfbde601151edec47b4c78f16ff0348d2aa76d6 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8150894a31 -s ours am: 9caa07c236 -s ours" into rvc-qpr-dev-plus-aosp am: 0cfbde6011 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187281
Change-Id: I0a3285bf48b00116eedb433f9f49f86bfd286a35
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions