tree 28f21f6ac27c5b9abb062eeeb8ed27f333263d22
parent fb120acd841f7d8d0e1845f5bdd98abf35cb25b4
parent c63e87d53deb24c4286036313db11719173419b3
author Deepanshu Gupta <deepanshu@google.com> 1397673244 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1397673244 +0000

Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev