tree d519826c0676ac004f98ff2c794f2bd0b57d7902
parent 30e28248bc56758e949ffecce48009593e3a6016
parent d40f0af37398a9e6204f9a41e97fac737c5929a0
author Xin Li <delphij@google.com> 1633681788 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681788 +0000

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