diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:34:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-05 23:34:24 +0000 |
| commit | 67d840035be7d7d4f9f8f8e75aac6335138f1ccd (patch) | |
| tree | 2aa75931e8df4db1b15451a99c866961dabbe82f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | af91e1723cb78cd4f65a257ef8f02dd94d3cb9be (diff) | |
| parent | fb7b1afab0755d3f05888a2e36e202c26f1b0f7a (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 51ae4ade4d -s ours am: 06d1b3a584 -s ours" into rvc-d1-dev-plus-aosp am: fb7b1afab0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758285
Change-Id: I6c5356348622441f4789077020213db91912c0c0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions