yangjie eeaf1fcc50 resolve Conflicts %!s(int64=4) %!d(string=hai) anos
..
SConscript ef62febf1f [SConscript]update group name %!s(int64=4) %!d(string=hai) anos
cpu_port.c 82ae97e248 fix build error %!s(int64=4) %!d(string=hai) anos
cpu_port.h 76b6d7f90d fix scheduler bug in simulator. %!s(int64=4) %!d(string=hai) anos