tree 119214c6e9d6a946df03ebfbe906651feb0f1668
parent 7528f2253a5327d8b23f30b36807f5000fce13a6
parent 4175b01d51625cc6ed10d9a90845abb7617dc155
author Brad Fitzpatrick <bradfitz@android.com> 1290191276 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290191276 -0800

am 096c4c44: am 251384a7: Merge "Improve performance when getting styled string."

* commit '096c4c448d8110c21108f2db4a19a85099e78557':
  Improve performance when getting styled string.