summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Alan Viverette <alanv@google.com> 2022-09-30 18:41:52 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-09-30 18:41:52 +0000
commitafadeccb8735c372b79e304f8cbf8158b093e028 (patch)
treedb4acf438ea0dcc3b82d72b817e705efbdb54af2 /scripts/merge_json.py
parent2e4fa11110eff06437a5f4c1319d0ffc04233f55 (diff)
parent1dd5061d2c7146f7155f2b97c08907cbff3b2499 (diff)
Merge "Make writing command-line arguments as a comment in the generated file optional" into tm-mainline-prod
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions