OSDN Git Service

resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp
[android-x86/packages-apps-Settings.git] / res / values-nb /
drwxr-xr-x   ..
-rw-r--r-- 10469 arrays.xml
-rw-r--r-- 166463 strings.xml