merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -38,8 +38,7 @@ limitations under the License.
        style="@style/EditLabel.WithPaddingTop" />
      <LinearLayout
        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:orientation="horizontal" >
+        android:layout_width="match_parent" >
        <AutoCompleteTextView
          android:gravity="bottom"
          android:hint="@string/track_edit_activity_type_hint"