squareタイプをベースレイアウトに移動。

diff --git a/wear/src/main/res/layout-notround/activity_detail.xml b/wear/src/main/res/layout/activity_detail.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/activity_detail.xml
rename to wear/src/main/res/layout/activity_detail.xml

diff --git a/wear/src/main/res/layout-notround/activity_list.xml b/wear/src/main/res/layout/activity_list.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/activity_list.xml
rename to wear/src/main/res/layout/activity_list.xml

diff --git a/wear/src/main/res/layout-notround/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/activity_main.xml
rename to wear/src/main/res/layout/activity_main.xml

diff --git a/wear/src/main/res/layout-notround/column_detail.xml b/wear/src/main/res/layout/column_detail.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/column_detail.xml
rename to wear/src/main/res/layout/column_detail.xml

diff --git a/wear/src/main/res/layout-notround/column_laptime.xml b/wear/src/main/res/layout/column_laptime.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/column_laptime.xml
rename to wear/src/main/res/layout/column_laptime.xml

diff --git a/wear/src/main/res/layout-notround/column_list.xml b/wear/src/main/res/layout/column_list.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/column_list.xml
rename to wear/src/main/res/layout/column_list.xml

diff --git a/wear/src/main/res/layout-notround/icon_list.xml b/wear/src/main/res/layout/icon_list.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/icon_list.xml
rename to wear/src/main/res/layout/icon_list.xml

diff --git a/wear/src/main/res/layout-notround/information_dialog.xml b/wear/src/main/res/layout/information_dialog.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/information_dialog.xml
rename to wear/src/main/res/layout/information_dialog.xml

diff --git a/wear/src/main/res/layout-notround/select_reference_dialog.xml b/wear/src/main/res/layout/select_reference_dialog.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/select_reference_dialog.xml
rename to wear/src/main/res/layout/select_reference_dialog.xml

diff --git a/wear/src/main/res/layout-notround/select_set_reference_dialog.xml b/wear/src/main/res/layout/select_set_reference_dialog.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/select_set_reference_dialog.xml
rename to wear/src/main/res/layout/select_set_reference_dialog.xml

diff --git a/wear/src/main/res/layout-notround/time_model_picker.xml b/wear/src/main/res/layout/time_model_picker.xml
similarity index 100%
rename from wear/src/main/res/layout-notround/time_model_picker.xml
rename to wear/src/main/res/layout/time_model_picker.xml