OSDN Git Service

resolved conflicts for merge of cc634036 to master
-rw-r--r-- 346 Android.mk
-rw-r--r-- 10508 AndroidManifest.xml
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - assets
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests