am 7cb77c1a: resolved conflicts for merge of 1742f20c to master
am 7cb77c1a: resolved conflicts for merge of 1742f20c to master

* commit '7cb77c1a0d86b0fbc8774cd90cc81debc3508be1':
  Performance improvements for long text edition.

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