OSDN Git Service

resolve merge conflicts of 9feab7a8a5 to oc-mr1-dev am: a504291eef
-rw-r--r-- 1357 Android.mk
-rw-r--r-- 181207 AndroidManifest.xml
-rw-r--r-- 2404 CleanSpec.mk
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 10695 NOTICE
-rw-r--r-- 162 PREUPLOAD.cfg
-rw-r--r-- 1413 proguard.flags
drwxr-xr-x - res
drwxr-xr-x - src
drwxr-xr-x - tests
-rwxr-xr-x 1310 wrap_alpha.py