am 827eed06: am 47e4015b: Merge "Avoid airplane mode labels when Wi-Fi enabled." into ics-mr1

* commit '827eed06cd60edf6bb873c7603ec3150b2ba8157':
  Avoid airplane mode labels when Wi-Fi enabled.
This commit is contained in:
Jeff Sharkey 2011-11-30 11:48:21 -08:00 committed by Android Git Automerger
commit 3bb84c0cb7

Diff Content Not Available