commit | 40fbcf22f7444b7df857f4b8f8488fdba31208ec | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 06 09:50:16 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 06 09:50:16 2023 +0000 |
tree | 75f8b60fa364c6f497af4a04c4cc8d30762bdc1b | |
parent | 45e044cc1149b9065d3c565c472ed5d156bd35d0 [diff] | |
parent | 15aa965585e6517e74fa3ec35d0cc69dbfe13e62 [diff] |
[automerger skipped] Merge Android 14 am: 9aa6f39751 -s ours am: eba310540f -s ours am: 15aa965585 -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: Ia3c1b5c176a3c45b155f75a5cc363996383f9f01 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>