summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Florian Mayer <fmayer@google.com> 2024-09-19 20:56:06 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-19 20:56:06 +0000
commit2b466505fa4efd00d6f190ca5e81af14958544a0 (patch)
treec3b8bacd0ea3b94b8a11cda19c7d7a1beb3d1d37 /scripts/merge_json.py
parent3927f7aef38704e4b96258ae7e6f9377196040b4 (diff)
parentd72360f84bbba72c2fe91dd8991185c7451710e0 (diff)
Merge "Use -target-feature for MTE" into main am: d72360f84b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3264014 Change-Id: I361ce5aee2724871c791b6e119f020fb276d3af0 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