diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 22:59:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 22:59:37 +0000 |
| commit | 853fb6b670129cf31273fa3cf483eb68d9c4bdf2 (patch) | |
| tree | fded71d9a488755b496ee31bde524ea02ae70bf5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5377480ae05c61f9034a0ae07bd4bf3b12f2b062 (diff) | |
| parent | 4e6868a0dd5c629433cb7c903a624a02b7412932 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2aeec70aca -s ours am: df4abc713c -s ours" into rvc-qpr-dev-plus-aosp am: 4e6868a0dd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758234
Change-Id: I25fc4db1270e8b2754c5c4a7b16f511ee8168a97
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions