am fa057e68: am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev
am fa057e68: am 923c18b1: Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev

* commit 'fa057e68d0882722769451f326cd17dac2ae3832':
  Plumb display name into SurfaceFlinger

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