tree 60351007b6109fe5d97e3cc32887cf80d5501a9b
parent a7260731f45dfc9d92d4e338c44e48622313204e
parent 1000e3fa06d1d560a6e790730fa351c497bb2a0e
author Daniel Sandler <dsandler@android.com> 1318528394 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318528394 -0700

am 1000e3fa: (-s ours) Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0

* commit '1000e3fa06d1d560a6e790730fa351c497bb2a0e':
  Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)