tree cc98cb2ae47e22d126b081e707838231880d1cdf
parent af91b235aa30794cd0524a848de4924b23561d4e
parent 48e237211e2ccb22799b1811b4e63d0d78221a46
author Xin Li <delphij@google.com> 1696637975 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696637975 +0000

[automerger skipped] Merge Android 14 am: ab50b9e997 -s ours am: aaf862bed1 -s ours am: fd1379affb -s ours am: 898aa90c07 -s ours am: 48e237211e -s ours

am skip reason: Merged-In I19543d1bf29083d24609aae1b02e6235d0d78843 with SHA-1 b0915ceae9 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/jsr330/+/2776020

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