| commit | b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 19:44:37 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:44:37 2014 +0000 |
| tree | fd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a | |
| parent | 06f4c8c7315956a906d054d52ff7f27bf84db8b9 [diff] | |
| parent | 985bb326a6f2b63ed6ee6041654421fae098bcec [diff] |
am 985bb326: am fa206123: 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 '985bb326a6f2b63ed6ee6041654421fae098bcec': Set default text style in layoutlib as NORMAL [DO NOT MERGE]