am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev

* commit '874ae2adf8c24c4b9d68f781239a95ad047e212a':
  Fix scissor for functor invocation

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