tree 331b4002ee316c52b6666cae58146c92cb0fee4d
parent c789b60076aa8ff4b2824ced6c998d667f6945c1
parent e912a16ba2a6e913b47893bc99c9a846d7ce80a9
author Gilles Debunne <debunne@google.com> 1323724546 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323724546 -0800

am e912a16b: am 316ca505: Merge "Re-use SpanSets in TextLine" into ics-mr1

* commit 'e912a16ba2a6e913b47893bc99c9a846d7ce80a9':
  Re-use SpanSets in TextLine