summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Liana Kazanova <lkazanova@google.com> 2024-09-20 17:37:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-20 17:37:03 +0000
commit32eaaaacf229eb7a5fd83f0b9a4452755fbdd60e (patch)
tree2036294305b5931f5b036bb1ce4e82e84d572a53 /scripts/merge_json.py
parent96960c9be004eaa1f3de5bdec4754390d87d2603 (diff)
parent4340863ed900eacddffe782d44b8ed1693b72234 (diff)
Revert "Remove java_sdk_library "magic"" am: 4340863ed9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273158 Change-Id: I547d5b1e511a846a8444bac8817e12109ea1b7d0 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