| commit | 6f7e64030e55622b0b43d1f71a0977d916a72b24 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Nov 29 01:10:33 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 29 01:10:33 2022 +0000 |
| tree | 36fffe13a11dde0a107d4b7c49aba57b09c255c0 | |
| parent | 35a7171c1d7094fdc082d41b22c0299fe2728d71 [diff] | |
| parent | a444326dfc31965903664d5883b0d34760608722 [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/20536681 Change-Id: Ib3bf149519b065e53d0e88a63304e51f06ef486b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>