summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Priyanka Advani (xWF) <padvani@google.com> 2025-02-04 17:45:52 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 17:45:52 -0800
commit0213620385fe70809a7fbf4d271136309766ebb5 (patch)
treed4cfcddf8fe0634ce3a193a5191e36b7a7ed913f /scripts/merge_json.py
parentc6288ed40e8ae34263df958f8abdb0cdd922cf2b (diff)
parent2f9d1266815b8400f6a356554a7df88c2886212b (diff)
Merge "Revert "Upgrade to clang-r547379"" into main am: 2f9d126681
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3473698 Change-Id: I38681f7847bf75a83c39a74bf8d8bb5fe2fb7832 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