summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-04 11:04:27 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 11:04:27 -0800
commit6731682acad8fadc03ffdd5e87680da37235d546 (patch)
tree7c49894864a03bd95d4c18b58a5aa2a617338cf8 /scripts/merge_json.py
parent83678767c00a9bf79841a8e402f1f0aa5d3e2fc7 (diff)
parent6fe99c93c2ec80361d09b9d18398c539692a3a94 (diff)
Merge "Add wrapper around androidTransitionMutator to support generic blueprint.TransitionInfo" into main am: 39d6f2d716 am: 6fe99c93c2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3472608 Change-Id: I44ed4b7e2de88cf13e9656cc699996d9b79b205c 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