summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-11-12 18:56:49 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2024-11-12 18:56:49 +0000
commitc4253deedac2021ed50d633288acf26e0df797e1 (patch)
tree26591f1afc6dff6ba764e5576126fb304ef2fd33 /scripts/merge_json.py
parentf18c94b40f765cdf147bdd3e5c0f5012240093b8 (diff)
parentb3d6e75538d3d4e372bd4f433a5f7eacf743cc86 (diff)
Merge "Make chained_partitions accept other vbmeta modules" into main
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions