OSDN Git Service

am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity...
authorAlan Viverette <alanv@google.com>
Thu, 13 Mar 2014 10:01:45 +0000 (10:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 10:01:45 +0000 (10:01 +0000)
* commit '0100a310d8184baf9576925d160f8af09aa93b10':
  DO NOT MERGE Add preference for caption text opacity

1  2 
res/values/strings.xml

Simple merge