OSDN Git Service

resolved conflicts for merge of cc634036 to master
[android-x86/packages-apps-Browser.git] / tests /
drwxr-xr-x   ..
-rw-r--r-- 1189 Android.mk
-rw-r--r-- 1653 AndroidManifest.xml
drwxr-xr-x - src