tree 46ad23fd9e228e4ffccb2d0c02ea353d676e3362
parent 68a8cfb14bcc9fbe3d9d15a5fe99c9ef41b3b5a1
parent ddeca6128efbc13572ff27e0f039ad73d1f9e710
author Zi Wang <mrziwang@google.com> 1709926271 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1709926271 +0000

[automerger skipped] Merge "Add property Skip_jarjar_repackage" into main am: 5ae58dcabe am: ddeca6128e -s ours

am skip reason: Merged-In I9384c9c25ce581ac00d309a188cf7533eb2e44a6 with SHA-1 9bdd4228cb is already in history

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2990064

Change-Id: I2ae87e3bbfd2414845c757b54e48da1d6bffb540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>