OSDN Git Service

resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
-rw-r--r-- 6 .gitignore
-rw-r--r-- 2730 CleanSpec.mk
-rw-r--r-- 4279 buildspec.mk.default
drwxr-xr-x - core
-rw-r--r-- 29412 envsetup.sh
drwxr-xr-x - libs
drwxr-xr-x - target
drwxr-xr-x - tools