diff options
author | Bill Yi <byi@google.com> | 2021-08-29 20:39:02 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-29 20:39:02 +0000 |
commit | 8f486b4f5c9f62c1623dfec2ce085c2d3fe068ce (patch) | |
tree | d842c3ac81d4a8d700f75629210591b06098e100 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 478f9e6f5e839d4d0ce314eca5e5b9dcdabb9202 (diff) | |
parent | 83650c0e59703c87519b195a9d13a89ad1571b8c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6a29f55cfb -s ours am: 83650c0e59 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15693263
Change-Id: If5e858e6944d1089a69e8aeca29a6f4df898a320
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions