summaryrefslogtreecommitdiff
path: root/scripts/merge_json.py
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2025-02-04 16:33:02 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-02-04 16:33:02 -0800
commit8e5ae217f6d497fab9af4a400fc2f6d6bc8f38a6 (patch)
tree5666a65326961b713fdd1be1c8e5ae56b2e35cf1 /scripts/merge_json.py
parent76f1e1396e3c868da78c67cdcf87e815a08155fa (diff)
parent4bf1e166bbfbdb20877e21b3b78984f4e4b07a36 (diff)
Merge "Move installation of dexpreopted system server classpath libraries into apex" into main am: 4bf1e166bb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3467832 Change-Id: Icb02af1b247721d775bace1ab40b66880ebc7996 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