merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -17,7 +17,6 @@ limitations under the License.
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
  style="@style/TrackWidgetBoundingBox" >
  <LinearLayout
-    android:orientation="horizontal"
    android:paddingBottom="4dp"
    android:paddingTop="4dp"
    style="@style/TrackWidgetFrame" >