OSDN Git Service

resolved conflicts for merge of 66c429a8 to master
[android-x86/packages-apps-Browser.git] / res / values-fr /
drwxr-xr-x   ..
-rw-r--r-- 29357 strings.xml