tree df2bb0c56241d40a795d055cf7b7b7ca96f91365
parent ddd51fdb7117a6a0812968a47b43067d3d899991
parent 827eed06cd60edf6bb873c7603ec3150b2ba8157
author Jeff Sharkey <jsharkey@android.com> 1322682501 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322682501 -0800

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.