summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Wei Li <weiwli@google.com> 2025-02-04 13:33:49 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 13:33:49 -0800
commit0de83346acd10e503543add6087f689df1164346 (patch)
treeb4d61eea03804aa83f9b140169353b7cbec02e70 /scripts/merge_json.py
parentcc529a3f6b8442d4a09e2fdf3176b2389efb8244 (diff)
parent54bff2426cd15e67e024ed2c63ff2c64c81fb2df (diff)
Merge "Add NOTICE.xml.gz files generated by Soong" into main am: e8b3addc76 am: 54bff2426c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3475310 Change-Id: I610f34bd812bffa85b3684060fae05364084f353 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