Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
This commit is contained in:
Xin Li
2021-02-21 09:25:11 -08:00
237 changed files with 32244 additions and 47288 deletions

View File

@@ -25,6 +25,7 @@
style="@style/EntityHeader">
<LinearLayout
android:id="@+id/battery_info_layout"
android:layout_width="170dp"
android:layout_height="wrap_content"
android:layout_marginStart="72dp"