summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Jihoon Kang <jihoonkang@google.com> 2024-09-20 17:36:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-20 17:36:56 +0000
commit96960c9be004eaa1f3de5bdec4754390d87d2603 (patch)
tree8336e01142d4340195ac1a8d8c5bfa659bbc2c97 /scripts/merge_json.py
parent534c5c4dfdb0022700d83e680ebf3460c113ff98 (diff)
parent46e061399279fe4b414bf7d8b393fe701c33a05f (diff)
Merge "Revert "Restrict java_sdk_library in libs"" into main am: 46e0613992
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273157 Change-Id: I74574aea562352152a401d3efcbbb0e031dfdabf 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