diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-05 22:20:15 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 22:20:15 +0000 |
commit | d3c02edab5eeb4b021af9fc571cd4dcfed3898b3 (patch) | |
tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 941d5425e0644203e9a3942f8026f9e3a1faea19 (diff) | |
parent | 4c6621d4dc5759ea2b566e086125a7f1c57b96ef (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8816df37e4 -s ours am: 4b4ae36092 -s ours am: 4c6621d4dc -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519346
Change-Id: Idbc9b954ada539af5856e5fa8ef7c714364f5565
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions