Merge branch 'master' into google

wjc

14 小时以前 f151e203da870dbe281defcb1daf84a1a38ecac1

 app/src/main/res/layout/item_plant_details.xml

@@ -129,7 +129,7 @@

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="37.5dp"
                    android:layout_height="39dp"
                    android:orientation="horizontal">

                    <LinearLayout
@@ -254,7 +254,7 @@

                <LinearLayout
                    android:layout_width="match_parent"
                    android:layout_height="37.5dp"
                    android:layout_height="39dp"
                    android:orientation="horizontal">

                    <LinearLayout