OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev am: 0f04a5a93f am: 8c5c5b5cec
-rw-r--r-- 1716 Android.mk
-rw-r--r-- 167791 AndroidManifest.xml
-rw-r--r-- 2404 CleanSpec.mk
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
-rw-r--r-- 1434 proguard.flags
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests
-rwxr-xr-x 1310 wrap_alpha.py