OSDN Git Service

resolved conflicts for merge of 1bc128fd to master
-rw-r--r-- 160 Android.mk
-rw-r--r-- 4240 AndroidManifest.xml
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - res
drwxr-xr-x - src