OSDN Git Service

resolved conflicts for merge of 2f2882a0 to master
-rw-r--r-- 6 .gitignore
-rw-r--r-- 5857 CleanSpec.mk
-rw-r--r-- 4094 buildspec.mk.default
drwxr-xr-x - core
-rw-r--r-- 28590 envsetup.sh
drwxr-xr-x - libs
drwxr-xr-x - target
drwxr-xr-x - tools