OSDN Git Service

resolved conflicts for merge of 2af8a007 to master
[android-x86/packages-apps-Settings.git] / res / layout-xlarge /
drwxr-xr-x   ..
-rw-r--r-- 1167 access_point_category_for_setup_wizard_xl.xml
-rw-r--r-- 6287 date_time_settings_setupwizard.xml
-rw-r--r-- 1387 settings_top_level.xml
-rw-r--r-- 6297 wifi_settings_for_setup_wizard_xl.xml