diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 07:44:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 07:44:26 +0000 |
commit | c8581eab83c79de9e919b23fa26370b2e62ef8a1 (patch) | |
tree | d2816b6e2b056a8f75c9e01b760efb6909853514 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 26dd609213603e7cb04c1b02a5d8d5d432d40f0b (diff) | |
parent | 0d6d7a7495adc8d9124f5efc8a6bae74db2d18b8 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 21952d24d6 -s ours am: 0d6d7a7495 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1419989
Change-Id: I54c363f0e2561c4e87c080043407601b3e17d305
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions