tree d519826c0676ac004f98ff2c794f2bd0b57d7902
parent b0bc918e242e00801a42460cc79309c89f7138b8
parent ff394c916f03edff07f531af29e2378b5eef63d9
author Xin Li <delphij@google.com> 1633679810 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679810 +0000

[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s ours am: 629639a090 -s ours am: ff394c916f -s ours

am skip reason: Merged-In Ieccafa6fb2fea229b5b60b828c0c94a3dc7fe77a with SHA-1 95d9d77e3f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/replicaisland/+/1847653

Change-Id: Ia6f29be39482e853e00092b79fb9d9926b536fc4