diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:38:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:38:19 +0000 |
| commit | b593816a6b3a438f5c4e9cdb04261c881edbe1c7 (patch) | |
| tree | 17001935bca7251e44159fd6b39504447028f253 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4741c3056c760cd808f4a86ba4c30d35d8e8be07 (diff) | |
| parent | 77fb838999e45886d54c9a6166c3a60a893c9cc0 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 3c26551d2b -s ours am: 94f6045361 -s ours am: c2d85b8205 -s ours" into rvc-qpr-dev-plus-aosp am: 77fb838999 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11916186
Change-Id: I65d56bf05aaeaa6c5a68650dac631c44888e4fb6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions