OSDN Git Service

am c0f79432: Merge "Update captioning settings to match final design" into klp-dev
authorAlan Viverette <alanv@google.com>
Fri, 9 Aug 2013 22:22:05 +0000 (15:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Aug 2013 22:22:05 +0000 (15:22 -0700)
* commit 'c0f79432cff613e993a86bece93ab1ef674d9054':
  Update captioning settings to match final design


Trivial merge