tree 0a5b6fdba44f8fc75759fa1dbaabff2a7654551a
parent 925b911f53f0e1484be4232ea6a26e5696c81764
parent 502c83f4098cd964cf0c18474700488282396bcb
author Deepanshu Gupta <deepanshu@google.com> 1397674043 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397674043 +0000

am 502c83f4: am 00312846: (-s ours) am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev

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