tree 180870e81319c2263d6810fbd0502219cf39259c
parent b7431172a4c0dd0f73bce4d06e765cc0d9467301
parent 8ad4b8b1fedc9a200b49f322e73d406d43e32327
author Deepanshu Gupta <deepanshu@google.com> 1399059400 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399059400 +0000

am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE]

* commit '8ad4b8b1fedc9a200b49f322e73d406d43e32327':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]