OSDN Git Service

resolved conflicts for merge of 7790a210 to master
[android-x86/packages-apps-Music.git] / res / values-pt-keysexposed /
drwxr-xr-x   ..
-rw-r--r-- 1129 strings.xml