am 31ced5c1: am 350b7829: Merge "Fix NPE in the statusbar." into honeycomb-LTE

* commit '31ced5c140cae9b3ad90066a540346acd821a3c9':
  Fix NPE in the statusbar.