yangjie eeaf1fcc50 resolve Conflicts %!s(int64=5) %!d(string=hai) anos
..
include 0d8a216260 [network][netdev] Improve the default netdev operation and format code %!s(int64=6) %!d(string=hai) anos
src 963f35e96d Update netdev.c %!s(int64=5) %!d(string=hai) anos
SConscript ef62febf1f [SConscript]update group name %!s(int64=5) %!d(string=hai) anos