OSDN Git Service

resolved conflicts for merge of aafb2fd2 to eclair-mr2
-rw-r--r-- 159 Android.mk
-rw-r--r-- 4915 AndroidManifest.xml
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - res
drwxr-xr-x - src