am 6b7d46b7: Merge "Restore scissor state correctly" into jb-mr1-dev
am 6b7d46b7: Merge "Restore scissor state correctly" into jb-mr1-dev

* commit '6b7d46b78c1c5c1ce3e077c0eed41c730f1686b4':
  Restore scissor state correctly

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