diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 00:11:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 00:11:41 +0000 |
commit | 73740f2e47a64e48f1df1f6898f350f56b53a128 (patch) | |
tree | e1fd5c9113c23e3dfe3dd13a402374634a65a958 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d3c02edab5eeb4b021af9fc571cd4dcfed3898b3 (diff) | |
parent | 1d50e2b3c91226e22387072e50166fc568e61f72 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 1b11e4ca9c -s ours am: 2575bdbf1b -s ours am: 1d50e2b3c9 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519348
Change-Id: I0727b1e2874d4312f66e3890a8ffb5c1f7046084
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions