commit | 309b5bf3cc95a841a0caed6394eaeeca97ae644a | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 29 00:44:55 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 29 00:44:55 2022 +0000 |
tree | f8af5bf94ed61e3e3a8bddcf52921d6f0d13988d | |
parent | 7d4cdd2fa45c78973b06981b4ec33d0cf563b691 [diff] | |
parent | bfed347796ec07b614d29d64644858d64ad6a952 [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: I78924a7bda44f40e7e58b453889c9c1a7d6ffc02 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>