am 5084e69b: Merge "Make debug.layout usable with hw acceleration on" into jb-dev
am 5084e69b: Merge "Make debug.layout usable with hw acceleration on" into jb-dev

* commit '5084e69b2ce2880f9ac9346618a5ab35c030cf62':
  Make debug.layout usable with hw acceleration on

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