am c06669a3: Merge "Fix scaling on notification panel wifi/battery icons." into ics-mr1

* commit 'c06669a303f2122a71e83d4813ecf78e6ff2b5a5':
  Fix scaling on notification panel wifi/battery icons.