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

* commit '923c18b1421296c2ed37a51d055283e94f99fc53':
  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