merge heads

2013-11-20 10:36:47 -08:00
parent 45909e70b6
commit 63c1330f50
68 changed files with 1487 additions and 1176 deletions
@@ -20,7 +20,6 @@ limitations under the License.
    android:id="@+id/track_controler_container"
    android:layout_height="wrap_content"
    android:layout_width="match_parent"
-    android:orientation="horizontal"
    android:paddingBottom="8dp"
    android:paddingTop="8dp" >
    <View