tree d519826c0676ac004f98ff2c794f2bd0b57d7902
parent debebe406545a2c0cc872d0cec02fbd50623cee1
parent 629639a0908ff7b1e54d1caad423d2fbc6c326a0
author Xin Li <delphij@google.com> 1633657175 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657175 +0000

[automerger skipped] Merge "Merge Android 12" am: 9dbab2a8df -s ours am: 629639a090 -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: I6f4ab73b0f32f8c906bdb3afb5a0bfd9cc92874f