OSDN Git Service

am 6dde146d: Merge "Update captioning settings to match revised API" into klp-dev
authorAlan Viverette <alanv@google.com>
Fri, 30 Aug 2013 21:38:21 +0000 (14:38 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 30 Aug 2013 21:38:21 +0000 (14:38 -0700)
commitc7e34676ffffa03269f5686072abd5eae60fa85f
treeac49400f6a0a5bafcc3069091a2a3c294d4eb337
parent02f711263cf30daf90361a4ba93bef4c2d0e38fc
parent6dde146df030dfada1a9e112621e97424a2b6e3c
am 6dde146d: Merge "Update captioning settings to match revised API" into klp-dev

* commit '6dde146df030dfada1a9e112621e97424a2b6e3c':
  Update captioning settings to match revised API