tree e7dfe5daeab98b225bb9f472e43ea319259f4e73
parent 5fe506f8a9f6ec343bad9a1ee9af9f1c7f0c6a6e
parent 95df6f6cadd466b5b5aa1f88186f652aa72fc129
author Colin Cross <ccross@android.com> 1646701944 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646701944 +0000

Merge changes from topic "google-java-format-jdk17" am: 6393823b21 am: 95df6f6cad

Original change: https://android-review.googlesource.com/c/platform/external/auto/+/2008542

Change-Id: Ia6c7661d79d886f89dcf053f5a2eb6103983c40e