tree bd73574526a2a13b96e0b8b595d33a90a6ecc804
parent aa11f79c801d8c2f094269923a4f8e8413bf5a53
parent 5c2aaabb9abb73d0ed612abc62458a909be19c2b
author Jason Chen <jasonchen@google.com> 1299031076 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1299031076 -0800

am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb

* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
  Bugfixes in StaticLayout. DO NOT MERGE.