diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-04 00:14:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-04 00:14:33 +0000 |
| commit | d232563a25825abb0110862398350ba6e12f899b (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 301657a18c9d50ba476015ded24eed0facfe3a36 (diff) | |
| parent | 3c7767fcd152e4079b01b029fde02b909e0eda6e (diff) | |
Merge "Merge "[automerger skipped] Import translations. DO NOT MERGE am: 52853711c6 -s ours am: 6101c0fc0f -s ours" into rvc-d1-dev-plus-aosp am: 4d96a3d8bc -s ours" into rvc-qpr-dev-plus-aosp am: 3c7767fcd1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077345
Change-Id: I435e6ac11534455f30f2b8371b5bb12d5791f773
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions