OSDN Git Service

am 7f721057: (-s ours) resolved conflicts for merge of 52667f55 to klp-modular-dev
-rw-r--r-- 2163 Android.mk
-rw-r--r-- 810 README
-rw-r--r-- 8901 common.mk
drwxr-xr-x - host
drwxr-xr-x - shared
drwxr-xr-x - system
drwxr-xr-x - tests