| commit | 79c9285a0238dcc931a4145edcac608435dfcece | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 19:49:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:49:11 2014 +0000 |
| tree | 1de886a057bff8a44a5ea254a6bcb86cb88246d8 | |
| parent | 911ad51b052a0df9e0dde66f83d3ab55e62a3826 [diff] | |
| parent | b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7 [diff] |
am b873a0a3: (-s ours) 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 'b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7': Set default text style in layoutlib as NORMAL [DO NOT MERGE]