summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Zi Wang <mrziwang@google.com> 2024-06-14 00:16:50 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-06-14 00:16:50 +0000
commitd156fee22433d44966e3485e6b7bb5465c2dee61 (patch)
treefe8bd626ec59d2836cecbda7e9b298f16888b73e /scripts/merge_json.py
parent5078551e9763b69c5d8fd56a36b96f836385963d (diff)
parentba2a460008203c7ee4c42a21d26e0df7145fbf17 (diff)
Merge "Use OutputFilesProvider on syspropJavaGenRule" into main
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions