summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Nikita Ioffe <ioffe@google.com> 2025-02-04 10:37:45 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 10:37:45 -0800
commit6fff658ef135177ac4a9074e2ca8598c48243490 (patch)
treef808cab9ca294296663813911232f32a971223dd /scripts/merge_json.py
parent0312b6054704f4772db06bd671e63a890c0e9f18 (diff)
parent93a9c7341c217406c2f6db53e14ee7fb39d8e6fa (diff)
Merge "Default avb_hash_algorithm to sha256 for android_filesystem modules" into main am: 93a9c7341c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3463840 Change-Id: I6fa9095fdfcef85d2fbf0b142d992271e0a71de9 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