| commit | 036e06730ef5f579d9978d8ea8abe8edfc4b7ce4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:17 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:17 2021 +0000 |
| tree | 32b3e2f0b088710de40cc8373919c87ccc8cdbf4 | |
| parent | 4d5fd52090dc4e88d36b094202d50093948563c5 [diff] | |
| parent | 2548bce5d52d8673ee3a7e7e436d068aff4cb5d2 [diff] |
[automerger skipped] Merge Android 12 am: 0115b2d339 -s ours am: c19001d298 -s ours am: 2548bce5d5 -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: Iea15d4e4633da7ce9db5cbcfa791c2788d98f406