tree 758797e46ab40c386dd3cee31423d00c551b98dd
parent 8e94d912c6e0fc3c6d5e992b6559a0efc20372be
parent 316ca5059ebd7270a04da5649d25653c355e158d
author Gilles Debunne <debunne@google.com> 1323396012 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323396012 -0800

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

* commit '316ca5059ebd7270a04da5649d25653c355e158d':
  Re-use SpanSets in TextLine