Merge "Changed information string about model" into nyc-mr1-dev

    <!-- About phone screen, status item label  [CHAR LIMIT=60] -->

    <string name="security_patch">Android security patch level</string>

    <!-- About phone screen, status item label  [CHAR LIMIT=40] -->

    <string name="model_number">Model number</string>

    <string name="model_info">Model</string>

    <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->

    <string name="fcc_equipment_id">Equipment ID</string>

    <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

        <Preference android:key="device_model"

                android:enabled="false"

                android:shouldDisableView="false"

                android:title="@string/model_number"

                android:title="@string/model_info"

                android:summary="@string/device_info_default"/>

        <!-- Device firmware version -->