tree 26a763be2d11ab4b604602df7a605f8f18b786b0
parent 32ffe5b58c3da70921e1a01130ea30f41adbdb96
parent e89c608453ac81f4ff897df32c8ad83692aa6285
author Xin Li <delphij@google.com> 1633681805 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681805 +0000

[automerger skipped] Merge Android 12 am: 188692e6c3 -s ours am: d596c959e6 -s ours am: d18fc07903 -s ours am: e89c608453 -s ours

am skip reason: Merged-In I9114ea285729d962366230d32f254619edd5ffa5 with SHA-1 467ec3fd0c is already in history

Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.metadata/+/1847593

Change-Id: I25e536554d134991f7710941f2a4648deaef42df