diff options
| author | 2025-02-04 18:09:24 -0800 | |
|---|---|---|
| committer | 2025-02-04 18:09:24 -0800 | |
| commit | 6cecbeaa23007581d750bda61dd3a7902bbd7e2b (patch) | |
| tree | 39916202898831b00869eb8387892e834c3215e9 /scripts/merge_json.py | |
| parent | 2abf99db5279571663f5f2c988bf50914c3b0289 (diff) | |
| parent | 0213620385fe70809a7fbf4d271136309766ebb5 (diff) | |
Merge "Revert "Upgrade to clang-r547379"" into main am: 2f9d126681 am: 0213620385
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3473698
Change-Id: I65a0bcecdfa06973b81b4b743077658184ca4cc0
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