OSDN Git Service

resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp
-rw-r--r-- 6 .gitignore
-rw-r--r-- 8121 CleanSpec.mk
-rw-r--r-- 4094 buildspec.mk.default
drwxr-xr-x - core
-rw-r--r-- 31585 envsetup.sh
drwxr-xr-x - libs
drwxr-xr-x - target
drwxr-xr-x - tools