diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:53:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-06 14:53:07 +0000 |
| commit | 91ac54de77f278a470504a869527bde4f5607382 (patch) | |
| tree | b5d9df6968d259c499fe2a907f44a20a61d873e5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 30b5ec1d08b546149dc8efd129252457389edc51 (diff) | |
| parent | b578f40416efa47e8fd5b6d88b774dad64ecbccd (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: cc4a65b365 -s ours am: e861ab7cb2 -s ours am: 4b4922186a -s ours" into rvc-d1-dev-plus-aosp am: b1ee63639f -s ours am: b578f40416 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12086503
Change-Id: Ic345366abdd929ec79bfd4f2e9fc38dd761a9703
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions