am 26587478: am 84201f75: Merge "Revert "Revert "Remove String version of getBadgedLabel""" into lmp-dev
am 26587478: am 84201f75: Merge "Revert "Revert "Remove String version of getBadgedLabel""" into lmp-dev

* commit '26587478517eb76ff4fd27540230b927b8f7eee2':
  Revert "Revert "Remove String version of getBadgedLabel""

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base