tree e0165a24d1b00da84d88acac41b97518714ceb76
parent ae3e5bc93f1077615b4ec8f6fbd06509241d25de
parent badf5a9442e639dc6ae2c4794c202143f6d2f16d
author Gilles Debunne <debunne@google.com> 1340070972 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340070972 -0700

am badf5a94: Merge "Fixed text rendering issue with spans." into jb-dev

* commit 'badf5a9442e639dc6ae2c4794c202143f6d2f16d':
  Fixed text rendering issue with spans.