Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 9167ba50: merge from open-source master

Browse Source 
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken

* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
  Corrected debug message in WindowManager
  Put the wifi status icon in the right place.
This commit is contained in:
The Android Open Source Project
2010-05-14 09:15:41 -07:00
committed by Android Git Automerger
parent 1e4dc54d56 9167ba50e4
commit db20eeb246
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/res/values/arrays.xml
View File

@@ -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>