commit | 5ac331481a9531a11dfe81d21870d70c362a9a2c | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Fri May 02 19:48:05 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 02 19:48:05 2014 +0000 |
tree | 97d614e1bfa7d61342808b578a69d8156139832f | |
parent | eecb79a863583998159cb44d393db03eebbdf7bc [diff] | |
parent | 29376cea1b9c7e17562540e31ca14565361d693b [diff] |
am 29376cea: (-s ours) am a996ff5c: am c529b700: am 8ad4b8b1: (-s ours) am 9932e589: am 9e2dadae: am bcbeaf83: Set default text style in layoutlib as NORMAL [DO NOT MERGE] * commit '29376cea1b9c7e17562540e31ca14565361d693b': Set default text style in layoutlib as NORMAL [DO NOT MERGE]