commit | 9d2c6f4cd23f58f9fc15d813c366f9b917cfd837 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 09:00:15 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 09:00:15 2021 +0000 |
tree | 26a763be2d11ab4b604602df7a605f8f18b786b0 | |
parent | 24f5ae0dd6422741ab45ee666fcab237952576df [diff] | |
parent | 2b676f49e59a5cfbbde96c690e8ccca5705295ee [diff] |
[automerger skipped] Merge Android 12 am: 188692e6c3 -s ours am: d596c959e6 -s ours am: d18fc07903 -s ours am: e89c608453 -s ours am: 2b676f49e5 -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: I878deb72162bfa3abe063461a8a5a2cf0a6f7b8b