summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Cole Faust <colefaust@google.com> 2024-11-12 20:04:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-11-12 20:04:52 +0000
commit410a80a278abfe5d47c0266cd14db74daa4987d6 (patch)
tree8e4f725daa366cb6256d202b5ab65b5fe0f05107 /scripts/merge_json.py
parentba4351440019f24fd0887208ff8e871a320688c3 (diff)
parentf1c83ad42b4fb8f1ec875d580605b25e8cb3209c (diff)
Merge "Add GSI support for android_system_image" into main am: f1c83ad42b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3334196 Change-Id: I7901c28d7ab9a28660eb9cd621e4f7244bd02e6c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'scripts/merge_json.py')
0 files changed, 0 insertions, 0 deletions