| commit | f625582963fa0ec2d448765fecc565ceea8d34fc | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Dec 12 15:30:25 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 12 15:30:25 2011 -0800 |
| tree | 61b68f1727d3f8eacdd7621c7dd76907a0d70374 | |
| parent | f3ebd42a48d0ffb7e19e4959d063cb0b4d341c46 [diff] | |
| parent | 7cb77c1a0d86b0fbc8774cd90cc81debc3508be1 [diff] |
am 7cb77c1a: resolved conflicts for merge of 1742f20c to master * commit '7cb77c1a0d86b0fbc8774cd90cc81debc3508be1': Performance improvements for long text edition.