am 205a9c08: am b7df3a71: Merge "Make display info accessible from hidden api." into jb-mr1-dev
am 205a9c08: am b7df3a71: Merge "Make display info accessible from hidden api." into jb-mr1-dev

* commit '205a9c08c94b5cee1b9b04ff4a1f448e5330236b':
  Make display info accessible from hidden api.

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