am b0a23017: am f37e38a0: am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev
am b0a23017: am f37e38a0: am f966cf35: Merge "default the screen on during the dream." into jb-mr1-dev

* commit 'b0a230174d3c8a6d13935679ee7d2e90c0817c14':
  default the screen on during the dream.

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