tree 26f1d1b10fec448c6a46ba2a7dfec7fc46d01bf2
parent 013af337bc804a0b491bd3f1e1cba45d61cbe2ea
parent 00312846e1e5513b3b32aa4fab399e51daf0c1b3
author Deepanshu Gupta <deepanshu@google.com> 1397673827 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397673827 +0000

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 '00312846e1e5513b3b32aa4fab399e51daf0c1b3':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]