diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 21:39:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 21:39:48 +0000 |
| commit | 528da9ff9d503c395a75486ab619d6325aa21431 (patch) | |
| tree | 95336a986747e2f1fc288452d13d1459de4f6c3b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 452ce87242914ce281f12cce776c357cfc46fe6d (diff) | |
| parent | 78ef9eb105ef356c539f4237c77e75c0bb73d855 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: a7afeea7b6 -s ours am: eae2b4dbfb -s ours" into rvc-qpr-dev-plus-aosp am: 78ef9eb105 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11988027
Change-Id: I31184a701aa95c4139295b5b52a437ac340a98cb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions