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

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