tree 80ca4df1f6c3f595362cc0d6625aef7c437efe9a
parent 0f07eb51cc5eb6324866f5853dde16d0bad75acc
parent 7c35d9218e1444f54b48c8ad72768abf85a5ecee
author Colin Cross <ccross@android.com> 1705390410 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1705390410 +0000

Merge remote-tracking branch 'aosp/upstream-master' am: f3b6953e53 am: 7c35d9218e

Original change: https://android-review.googlesource.com/c/platform/external/jarjar/+/2907692

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