commit | 2cb9147fc49e6474eaf30fd833e43df10e42b899 | [log] [tgz] |
---|---|---|
author | Xavier Ducrohet <xav@google.com> | Thu Feb 20 17:46:05 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 20 17:46:05 2014 +0000 |
tree | 1c7669753ee3355ffc7a699a225cf5afda97794c | |
parent | ca4b9a77e7d20703287b33b203b2582bd43f7792 [diff] | |
parent | 55542ee6449bd580f61bc005726b5c87773fbe25 [diff] |
am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev * commit '55542ee6449bd580f61bc005726b5c87773fbe25': Set default text style in layoutlib as NORMAL [DO NOT MERGE]