OSDN Git Service

am 7cb77c1a: resolved conflicts for merge of 1742f20c to master
authorGilles Debunne <debunne@google.com>
Mon, 12 Dec 2011 23:30:25 +0000 (15:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Dec 2011 23:30:25 +0000 (15:30 -0800)
commite87872167772b80001fd9cd5b601ef343819347a
tree8cef08e323746a2ae01800c70e083ad67d7fcb9a
parent6b0b81879b7df93f2856e4ea5fa079e60c63d0cf
parentb0332ef11a1464f504354ffe1183dd6c3fb3b15f
am 7cb77c1a: resolved conflicts for merge of 1742f20c to master

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