merge in lmp-mr1-release history after reset to lmp-mr1-dev
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 5e75c10..2d22f32 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -51,7 +51,7 @@
<dimen name="medium_font_size">48sp</dimen>
- <dimen name="circle_size">232dip</dimen>
+ <dimen name="circle_size">190dip</dimen>
<dimen name="stopwatch_list_bottom_spacing">0dip</dimen>
<dimen name="stopwatch_circle_margin_bottom">80dip</dimen>
diff --git a/res/values-sw360dp-land/dimens.xml b/res/values-sw360dp-land/dimens.xml
new file mode 100644
index 0000000..47e269b
--- /dev/null
+++ b/res/values-sw360dp-land/dimens.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<!--
+ These resources are around just to allow their values to be customized
+ for different hardware and product builds.
+-->
+<resources>
+
+ <dimen name="circle_size">232dip</dimen>
+
+</resources>
