| commit | 17d714767c05d92d911d7178cb9858730edcf48b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Sat Oct 07 00:19:36 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 07 00:19:36 2023 +0000 |
| tree | 2e20643c062938200aca70036dd5aff16a0334fa | |
| parent | d99bb2e12dbd92085af303f273b66ddee72d1edf [diff] | |
| parent | e4ff37862ace3f63912fb5715091d645669fb449 [diff] |
[automerger skipped] Merge Android 14 am: 9aa6f39751 -s ours am: eba310540f -s ours am: 15aa965585 -s ours am: 40fbcf22f7 -s ours am: e4ff37862a -s ours am skip reason: Merged-In I1a114e200f679c87ca63f1f5072306d0d1d05e70 with SHA-1 8de774e9c4 is already in history Original change: https://android-review.googlesource.com/c/platform/system/libsysprop/+/2777247 Change-Id: I249ff160b9ddfcac577e736619e77424873fc076 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>