OSDN Git Service

Use "merge -s ours origin/mirror-partner-mm-wireless-dev" as described in b/26154276
[android-x86/packages-apps-Settings.git] / res / values-hr /
drwxr-xr-x   ..
-rw-r--r-- 30706 arrays.xml
-rw-r--r-- 360795 strings.xml