diff options
| author | 2024-09-20 18:12:32 +0000 | |
|---|---|---|
| committer | 2024-09-20 18:12:32 +0000 | |
| commit | 1aeedb0d5128c8c1d84f5ac95e4155cd4c0c93c8 (patch) | |
| tree | e203c157fc1592804262747a3390da787570b519 /scripts/merge_json.py | |
| parent | a8ecee9f76eb5a3e8d513469c477ba9b89762833 (diff) | |
| parent | 6eff4e34f44f1e8aa6d7af29e7ba06ff32235bbb (diff) | |
Merge "Revert "Revert "Add new module type notice_xml which is used to ..."" into main am: 6eff4e34f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273292
Change-Id: I86a6c9fc3c1747db7ae8739297908180c3fe1243
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