tree 680fb999d274de9f505030a2d1ba041ac34d55c2
parent 4eeaa61f6b4b7b37712e1c385a75aa8a4b89e381
parent 0fe634737b24fd8f4dc8d0f49eb15ea176242428
author Deepanshu Gupta <deepanshu@google.com> 1397673637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397673637 +0000

am 0fe63473: am 04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev

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