diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:57:48 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:57:48 +0000 |
commit | ef6585b5a88fdc36fb1d87461b0d080cd7042c06 (patch) | |
tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f1ce0899ede2a5db18b73618b65cc2c2da7552a9 (diff) | |
parent | 06d951ea4e8453982b0d065a5d906570ba778f63 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 740f9a6a91 -s ours am: e3738078e9 -s ours am: 932108123a -s ours am: 6784db4ef6 -s ours am: 06d951ea4e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420255
Change-Id: I8ed7c87a877146cec406886f608459c190c10f8b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions