[automerger skipped] Merge "Fix AttestKeyTest failures in KeyMint VTS" into android12-tests-dev am: bd01292ab7 am: 198bcf3a6d -s ours am: 9f1f92c4a8 -s ours am: fe823a11c2 -s ours
am skip reason: Merged-In I8199e5c7570b10b71f127c7439b889c0b3327865 with SHA-1 981c9c2236 is already in history
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2665235
Change-Id: Id99a139395901ff43f8916f94a43fa85ed1173f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl
index 56aa690..3303ff9 100644
--- a/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl
+++ b/camera/metadata/aidl/android/hardware/camera/metadata/CameraMetadataTag.aidl
@@ -2282,7 +2282,8 @@
*
* <p>Whether this camera device can support identical set of stream combinations
* involving HEIC image format, compared to the
- * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice.html#legacy-level-guaranteed-configurations">table of combinations</a> involving JPEG image format required for the device's hardware
+ * <a href="https://developer.android.com/reference/android/hardware/camera2/CameraDevice#legacy-level-guaranteed-configurations">table of combinations</a>
+ * involving JPEG image format required for the device's hardware
* level and capabilities.</p>
*/
ANDROID_HEIC_INFO_SUPPORTED = CameraMetadataSectionStart.ANDROID_HEIC_INFO_START,