tree a54d67eb156e917a4acc16c4cdbfafa2321bb545
parent cdc1a93b033dd9626c1f2c3960f6b4776680f15f
parent f7bf978b9fbd4afb0c808d4fd72a744c6d46520b
author Colin Cross <ccross@android.com> 1646703850 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646703850 +0000

Merge commit 'v1.14.0^' am: a9457c0ad5 am: 1df1f0c9dd am: f7bf978b9f

Original change: https://android-review.googlesource.com/c/platform/external/google-java-format/+/2008223

Change-Id: I319351cfe1abbfb622daf134dd02078f6f650cd3