OSDN Git Service

resolved conflicts for merge of 63e70b24 to honeycomb-plus-aosp
-rw-r--r-- 3 .gitignore
-rw-r--r-- 953 Android.mk
-rw-r--r-- 2227 CleanSpec.mk
-rw-r--r-- 764 README
-rw-r--r-- 249 ThirdPartyProject.prop
drwxr-xr-x - adb
drwxr-xr-x - cpio
drwxr-xr-x - debuggerd
drwxr-xr-x - fastboot
drwxr-xr-x - include
drwxr-xr-x - init
drwxr-xr-x - libctest
drwxr-xr-x - libcutils
drwxr-xr-x - libdiskconfig
drwxr-xr-x - liblinenoise
drwxr-xr-x - liblog
drwxr-xr-x - libmincrypt
drwxr-xr-x - libnetutils
drwxr-xr-x - libpixelflinger
drwxr-xr-x - libsysutils
drwxr-xr-x - libusbhost
drwxr-xr-x - libzipfile
drwxr-xr-x - logcat
drwxr-xr-x - logwrapper
drwxr-xr-x - mkbootimg
drwxr-xr-x - mksh
drwxr-xr-x - netcfg
drwxr-xr-x - nexus
-rw-r--r-- 507 patch.txt
drwxr-xr-x - rootdir
drwxr-xr-x - run-as
drwxr-xr-x - sdcard
drwxr-xr-x - sh
drwxr-xr-x - toolbox