Skip to content

Commit

Permalink
Merge commit '07b948b2fffe2d410a71746aa9f4d4b680ca42b6' into HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
devrel-build committed Jan 23, 2017
2 parents 475546b + 07b948b commit a9d1eb9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion library/src/main/res/layout-v14/texture_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<TextureView
android:id="@+id/texture_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:gravity="center"
/>

</merge>
4 changes: 3 additions & 1 deletion library/src/main/res/layout/surface_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<SurfaceView
android:id="@+id/surface_view"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:gravity="center"
/>

</merge>

0 comments on commit a9d1eb9

Please sign in to comment.