diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 20:36:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-08 20:36:36 +0000 |
| commit | f1f7cca29da9ba706e248277d419edbacd573581 (patch) | |
| tree | 9d19919a6fca0b87b5d6e9a53d9c4942c9e826d3 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | bec8cbead2ee84524846a631106284d63d8bf6bb (diff) | |
| parent | cf30bb36a64244832a1dc5ccdf481f1014c5d2f1 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 93e19bed18 -s ours am: 84a1f72911 -s ours" into rvc-d1-dev-plus-aosp am: cf30bb36a6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11758233
Change-Id: Ic3c19d9a13e79c5936c869de4c77e756ed437b69
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions