am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev
am f9800a01: am 08b30908: Merge "Ensure we compute display name when needed" into jb-dev

* commit 'f9800a01fe3690bac64bff0ba734a39f8a7f8ada':
  Ensure we compute display name when needed

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