OSDN Git Service

am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev
authorAlan Viverette <alanv@google.com>
Thu, 5 Jun 2014 21:00:32 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Jun 2014 21:00:32 +0000 (21:00 +0000)
* commit '3966c9604e55c9183a6d1ba8b3540add3be4434f':
  Add defaults for caption colors and edge type

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge