OSDN Git Service

resolved conflicts for merge of 22311914 to master
-rw-r--r-- 12 .gitignore
-rw-r--r-- 16452 CleanSpec.mk
-rw-r--r-- 4287 buildspec.mk.default
drwxr-xr-x - core
-rw-r--r-- 41533 envsetup.sh
drwxr-xr-x - libs
drwxr-xr-x - target
drwxr-xr-x - tools