OSDN Git Service

am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 2 May 2014 19:36:40 +0000 (19:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 May 2014 19:36:40 +0000 (19:36 +0000)
* commit '8ad4b8b1fedc9a200b49f322e73d406d43e32327':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]


Trivial merge