summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2024-09-20 02:44:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-20 02:44:52 +0000
commit548cecc0de1db5c8dcb3c5a2e56fc70825296f0c (patch)
tree142f14dce094d83c13e7b7c6139c5fa418ff1d0a /scripts/merge_json.py
parent24be7e0d988a2fd0fc8ad24ec1047a2749c6bdef (diff)
parentf771470d8cdd40e2fa788a722bd6541fbefc0538 (diff)
Merge "Fixes host_required_modules for test_module_config" into main am: f771470d8c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3274732 Change-Id: Ic7397d392f3a0698020940de30155aef25c456d3 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