diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-31 03:49:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-31 03:49:05 +0000 |
commit | cbbe6dbb669fc81d3cf4a31d5533c7487be80b4f (patch) | |
tree | 34cdc72ca65dc1ce56a614b78c74e9e4d8a5f54b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | c2af346401066cd7eeb1a71df6629f88e85316a0 (diff) | |
parent | 767c9456d5018d5f59d5ec9cf6cfbd0d36a8ffff (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 841ae01c5c -s ours am: 521309ff46 -s ours am: cc086a2a74 -s ours am: 767c9456d5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12958097
Change-Id: I6ecba0aace7393b633bff78dc7d6bf5d40f90006
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions