OSDN Git Service

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


Trivial merge