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