OSDN Git Service

am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption...
authorAlan Viverette <alanv@google.com>
Thu, 13 Mar 2014 18:02:19 +0000 (18:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 18:02:19 +0000 (18:02 +0000)
commit3782a3a6a1a1d22e553cf04231d76103aaf36a7b
tree0c39ec598d971bb0597124c50ca9db27ec549362
parentb4a50745f2833cfb73c05586fa9f9b63c0dc1629
parent429720754d85e1b13bc9001adaa23a0b0db04b61
am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev

* commit '429720754d85e1b13bc9001adaa23a0b0db04b61':
  DO NOT MERGE Add preference for caption text opacity