OSDN Git Service

am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
authorAlan Viverette <alanv@google.com>
Tue, 20 Aug 2013 23:50:04 +0000 (16:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 20 Aug 2013 23:50:04 +0000 (16:50 -0700)
commit976590843aa26bd37501abbfe9d2a98da695c04f
treee95b840b72af1172d63029f5888944c6f0054e62
parent8551bcf59c9555d9ed993e05712cc74b764c7f60
parent35bac199324d07dd6cf16e3bd50df1feca8e9030
am 35bac199: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev

* commit '35bac199324d07dd6cf16e3bd50df1feca8e9030':
  Fix background and line wrapping in CaptionTextView