tree 9deab5762327530c5c1a7dd5d39bd30fdd74ee74
parent 1090f269f1d7e6fa2c25100b082a7a90a3e1ba3d
parent 6f1b8fdf9e309cab68422cdf93dfdfd3193e34b7
author Gilles Debunne <debunne@google.com> 1297115181 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297115181 -0800

am 63308bd0: am a324a581: Merge "Fix for StaticLayout bug with ellipsized text" into honeycomb

* commit '63308bd092a0edcea685d9f81b3d6d6d345c663b':
  Fix for StaticLayout bug with ellipsized text