OSDN Git Service

am 39c27f34: am f2e70fee: Merge "Specify light and shadow properties in theme"
authorAlan Viverette <alanv@google.com>
Mon, 14 Jul 2014 20:21:35 +0000 (20:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jul 2014 20:21:35 +0000 (20:21 +0000)
* commit '39c27f34ebeee9440f94583a1ec407fb0cf12a2d':


Trivial merge