am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev
am aabd9c23: Merge "Fix issue #6634325: View.setKeepScreenOn and..." into jb-dev

* commit 'aabd9c230f9849e8d52d2cb2e33bac7f163590d5':
  Fix issue #6634325: View.setKeepScreenOn and...

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