diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-15 07:40:44 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-15 07:40:44 +0000 |
commit | 11ff76c80377df1422ebb3686a3c8295f99e6d6f (patch) | |
tree | f7ced031d736e3f68a4c2dd668d450a1c0612d99 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | f3762c7b2241b27a0ca55044a9a2116628094c96 (diff) | |
parent | 67f786c9c11a8a4f46056c04c416d95dba4525f3 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 24761341ad -s ours am: 89480557f4 -s ours am: 67f786c9c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12384167
Change-Id: I20309c1c442e88c749ae096a051bfecb0bfb64e4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions