tree 55dad8ca4eb23d88c3150d51046995ea59661eef
parent 489c8960b66387fb043350310e5b53554cff4c1f
parent 910be3e855738eab783f2e280b76dcef90a841ec
author Brian Muramatsu <btmura@google.com> 1296255331 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296255331 -0800

am 910be3e8: am 9eaefb82: Merge "Fix TextUtils#commaEllipsize" into honeycomb

* commit '910be3e855738eab783f2e280b76dcef90a841ec':
  Fix TextUtils#commaEllipsize