tree bafc7cdb15e7b969807be68161dab1b198a02277
parent ccb9a0a9f0376f5971d0c0f79b297ec0cc1dd6c1
parent 73fafb382b9e44cac2e6a6649cd37a7dcb0c6de9
author Romain Guy <romainguy@google.com> 1295818479 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295818479 -0800

am 73fafb38: am f6834478: Always render text underline extra. Bug #3381287

* commit '73fafb382b9e44cac2e6a6649cd37a7dcb0c6de9':
  Always render text underline extra. Bug #3381287