OSDN Git Service

resolved conflicts for merge of 90c4833f to eclair-mr2
-rw-r--r-- 199 Android.mk
-rw-r--r-- 5857 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