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