commit | b43d0ba9398fc8d32a110c566d990386774668c3 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 29 01:46:47 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 29 01:46:47 2022 +0000 |
tree | fbe569fd274538b06b34aded8e3cb6f92307b17c | |
parent | b4a7c2625d6bf4c9a00f16c46b2214c1dff8d417 [diff] | |
parent | 6f7e64030e55622b0b43d1f71a0977d916a72b24 [diff] |
Merge "[conflict] [automerge] Use sp<T>::make to create the sp pointer for EventLoopCallback 2p: a9de1657e9 am: 3081d564cd am: b0302d8c00" into tm-dev am: bfed347796 am: a444326dfc am: 6f7e64030e Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I848321a45e432c0c2a7e4469b5693e0e4cf2de18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>