tree 259915c3ca85ffbaeeaa1a65e98d736f2b28c164
parent e146592c7bb3fba0f4f658f15405815541169212
parent 166055b529987554644dc47cb5b29ce33a1ab5d1
author Jason Chen <jasonchen@google.com> 1299108780 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299108780 -0800

am 166055b5: (-s ours) am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb

* commit '166055b529987554644dc47cb5b29ce33a1ab5d1':
  Bugfixes in StaticLayout. DO NOT MERGE.