diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 03:26:04 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 03:26:04 +0000 |
commit | b336e80b2c38624c9e80a85a7eea17970bebe583 (patch) | |
tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | b0cd3fe53e796a200d76c74e98b7812eb9dc27ca (diff) | |
parent | 96720f6f3f10d7dbe864061a59700100f73ee64c (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8f2203e459 -s ours am: 9681f759e8 -s ours am: fe9f098df4 -s ours am: 96720f6f3f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420492
Change-Id: I4e538a7a60cc4677573e220a96a3ef4ed70ec5c8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions