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