diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-11-29 02:17:11 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-29 02:17:11 +0000 |
commit | a475fea11c5a0c1b9305ec920c28dc9a78ad7358 (patch) | |
tree | fbe569fd274538b06b34aded8e3cb6f92307b17c | |
parent | 754dce7088199aec2b4658fd649124eed214e615 (diff) | |
parent | b43d0ba9398fc8d32a110c566d990386774668c3 (diff) | |
download | wificond-a475fea11c5a0c1b9305ec920c28dc9a78ad7358.tar.gz |
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 am: b43d0ba939
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681
Change-Id: I0ceac5b5b4af2ee9eb4ce5b67ee66313d065be0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions