Merge remote-tracking branch 'origin/master'

This commit is contained in:
Korusn Oleksandr 2017-01-04 18:11:21 +02:00
commit edbfc14934

View file

@ -6,6 +6,7 @@
android:background="@drawable/quick_action_background"> android:background="@drawable/quick_action_background">
<LinearLayout <LinearLayout
android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="8dp" android:layout_margin="8dp"