merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -34,7 +34,6 @@ limitations under the License.
    <item name="android:layout_height">wrap_content</item>
    <item name="android:layout_width">match_parent</item>
    <item name="android:measureWithLargestChild">true</item>
-    <item name="android:orientation">horizontal</item>
  </style>
  <style name="BottomButtonDivider">
    <item name="android:background">?android:attr/dividerVertical</item>