OSDN Git Service

AI 144245: Fix merge conflict for megering in the CDMA changes in to master from...
-rw-r--r-- 319 Android.mk
-rw-r--r-- 24384 AndroidManifest.xml
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests