diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 06:52:20 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 06:52:20 +0000 |
commit | 1da5b2d44c5944d70d97b007630d19834bd1a39b (patch) | |
tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f50ee3be17624a99ee330f5238247f77e519e680 (diff) | |
parent | 8a48949a091f64c1c356218467740f6a389aad9e (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f3a7728fb9 -s ours am: 9cbec70a10 -s ours am: 8a48949a09 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420409
Change-Id: Ice01129b14205c4c7e5061ec16f8e52846f14fe6
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions