am 5223a5ff: Merge "Add support for dumping new badging" into klp-dev
am 5223a5ff: Merge "Add support for dumping new badging" into klp-dev

* commit '5223a5ff24bed6d0a0ac618083a3ed050bdd98b2':
  Add support for dumping new badging

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