diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 21:25:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 21:25:30 +0000 |
| commit | 65c3d5b8f5a94534e22ef73e38f63c3fa308e1ed (patch) | |
| tree | 0c08bedfceccb72e808582bb5e5eeaf56b146bf1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4f0aef614e2f5aff2f8595ab737d18330e95524f (diff) | |
| parent | c3759ab47a906de1f38bb34b2b81ae0be13bc508 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: dfab28ce0d -s ours am: dfb32661e1 -s ours" into rvc-qpr-dev-plus-aosp am: c3759ab47a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758235
Change-Id: I35344d863ceb188294472e96204910238b63a57b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions