Merge "Add time to status bar and fix wifi icon." into lmp-dev

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_weight="1"/>

    <!-- The exact size of the wifi icon is specified in order to scale it properly.

    Without scaling, it appeared huge. This is currently, 70% of the actual size. -->

    <ImageView

			android:layout_height="wrap_content"

			android:layout_width="wrap_content"

            android:layout_height="22.4dp"

            android:layout_width="20.65dp"

            android:layout_marginTop="1dp"/>

    <ImageView

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_marginLeft="3dp"

            android:layout_marginRight="5dp"

			android:layout_marginTop="2dp"/>

            android:layout_marginTop="4dp"/>

    <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginTop="4dp"

            android:layout_marginRight="5dp"

            android:gravity="center_vertical"

            android:textSize="16dp"

            android:fontFamily="sans-serif-medium"/>

</merge>

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="32.0dp"

        android:height="29.5dp"

        android:viewportWidth="26.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M13.000000,22.000000L25.600000,6.500000C25.100000,6.100000 20.299999,2.100000 13.000000,2.100000S0.900000,6.100000 0.400000,6.500000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000L13.000000,22.000000z"/>

</vector>