tree 32b3e2f0b088710de40cc8373919c87ccc8cdbf4
parent 1404316858f7d64b81cd683c159d73b1b1f8e767
parent c19001d29853bc855887d1bfc3d4bcc75f541269
author Xin Li <delphij@google.com> 1633657141 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657141 +0000

[automerger skipped] Merge Android 12 am: 0115b2d339 -s ours am: c19001d298 -s ours

am skip reason: Merged-In I60bc87c510179299003d6824084686a58e61ea3c with SHA-1 c7127c1351 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/libsysprop/+/1847862

Change-Id: I1a5d35c39399fbf8744700ec72d12e3d4318eb77