diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 23:17:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 23:17:02 +0000 |
| commit | 1da7821989da17be3a12b939ca803fc171181614 (patch) | |
| tree | 18c80e84a75d7c9015aa6ecd8f8db2a8628aff35 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b1b43ec872c100616386e56e588d5f2070f200d9 (diff) | |
| parent | f5612df16ee53504b1473166aaa4915a350f29bf (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fc30db1bd8 -s ours am: e8faa17604 -s ours" into rvc-qpr-dev-plus-aosp am: f5612df16e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12422185
Change-Id: I2a56ad8b7b3020b22e7f8c725f5ce930021edfc4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions