am 98b07f4e: am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev
am 98b07f4e: am b02b14b2: am ef4a6f86: Merge "Do not do a layout and write while a cancellation is in progress." into klp-dev

* commit '98b07f4e1ea7c5a861c2c66278816ab6c8fd02d1':
  Do not do a layout and write while a cancellation is in progress.

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