summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-02-04 13:34:05 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 13:34:05 -0800
commit893035631e85c9b1b62f0358829cb987d11cd335 (patch)
treebc366f9fd7f454d17f801964dc05613a0d25b5e0 /scripts/merge_json.py
parent0de83346acd10e503543add6087f689df1164346 (diff)
parent384598d6c902c944858d8d21cd00fc2356a513da (diff)
Merge "Do not propagate uses lib tags of framework" into main am: 07699dcf39 am: 384598d6c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3476311 Change-Id: I067c094c0e743221b6f90c742139394c5ecd6102 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