Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db20eeb2 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am 9167ba50: merge from open-source master 

Merge commit '9167ba50' into kraken

* commit '9167ba50':
  Corrected debug message in WindowManager
  Put the wifi status icon in the right place.
parents 1e4dc54d 9167ba50

core/res/res/values/arrays.xml

+1 −1
Original line number Diff line number Diff line
@@ -128,11 +128,11 @@ 
        <item><xliff:g id="id">phone_evdo_signal</xliff:g></item>

        <item><xliff:g id="id">data_connection</xliff:g></item>

        <item><xliff:g id="id">cdma_eri</xliff:g></item>

        <item><xliff:g id="id">wifi</xliff:g></item>

        <item><xliff:g id="id">tty</xliff:g></item>

        <item><xliff:g id="id">volume</xliff:g></item>

        <item><xliff:g id="id">mute</xliff:g></item>

        <item><xliff:g id="id">speakerphone</xliff:g></item>

        <item><xliff:g id="id">wifi</xliff:g></item>

        <item><xliff:g id="id">tty</xliff:g></item>

        <item><xliff:g id="id">bluetooth</xliff:g></item>

        <item><xliff:g id="id">gps</xliff:g></item>