tree 6816d727d6823cb55224596b2bd5aae8fa81f855
parent 21904fe4632e6e3412c83964d64b4cbcf1d7b2ce
parent 504a8c9d18e67eb45cce5974340dda8269a2bbd0
author Xin Li <delphij@google.com> 1650443202 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650443202 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: d79c69ce6d -s ours am: aa67c8e15d -s ours am: 504a8c9d18 -s ours

am skip reason: Merged-In Iada34671296ebb7c1dc372638c91320bad6e7166 with SHA-1 9f1c919115 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/17805133

Change-Id: I5d7b78d375a1df83695e30196d80ef7923b5a186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>