OSDN Git Service

am 3782a3a6: am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preferenc...
authorAlan Viverette <alanv@google.com>
Thu, 13 Mar 2014 18:08:55 +0000 (18:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 18:08:55 +0000 (18:08 +0000)
commit0fa90474e0ee085051d9ba155705b7f5d3bc7bfa
tree0c39ec598d971bb0597124c50ca9db27ec549362
parent305013b1638e72712464f122435ff350aef5a6be
parent3782a3a6a1a1d22e553cf04231d76103aaf36a7b
am 3782a3a6: am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev

* commit '3782a3a6a1a1d22e553cf04231d76103aaf36a7b':
  DO NOT MERGE Add preference for caption text opacity