OSDN Git Service

resolved conflicts for merge of 6cf3c7c5 to jb-dev-plus-aosp
-rw-r--r-- 32 .gitignore
-rw-r--r-- 672 Android.mk
-rw-r--r-- 2227 CleanSpec.mk
-rw-r--r-- 236 MAINTAINERS
-rw-r--r-- 252 ThirdPartyProject.prop
drwxr-xr-x - libc
drwxr-xr-x - libdl
drwxr-xr-x - libm
drwxr-xr-x - libstdc++
drwxr-xr-x - libthread_db
drwxr-xr-x - linker