tree e731cd0d7bbe01d820022022ed58f7fddc11a81d
parent 1e4dc54d56b0a2289c5bba33281e6578bda005e0
parent 9167ba50e4d7e08e02119d9c4a0f0392296cc3f1
author The Android Open Source Project <initial-contribution@android.com> 1273853741 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273853741 -0700

am 9167ba50: merge from open-source master

Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken

* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
  Corrected debug message in WindowManager
  Put the wifi status icon in the right place.