Merge "Update "make password visible" preference string"

    <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->

    <string name="auto_punctuate_summary">Press Space key twice to insert \u0022.\u0022</string>

    <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->

    <string name="show_password">Make passwords visible</string>

    <string name="show_password">Show passwords</string>

    <!-- On Security & location settings screen. This is a short summary text describing what "Show passwords" setting does -->

    <string name="show_password_summary">Display characters briefly as you type</string>

    <!-- Warning message about security implications of enabling an input method, displayed as a dialog

         message when the user selects to enable an IME. -->

    <string name="ime_security_warning">This input method may be able to collect

            <intent android:action="android.settings.LOCATION_SOURCE_SETTINGS"/>

        </Preference>

        <SwitchPreference android:key="show_password"

                android:title="@string/show_password"/>

        <SwitchPreference

            android:key="show_password"

            android:title="@string/show_password"

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

    </PreferenceCategory>