commit | 36e8b4d3cdc7cbd98af1c97f4af3e2524c4cffc2 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Apr 16 19:49:04 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 16 19:49:04 2014 +0000 |
tree | 1de886a057bff8a44a5ea254a6bcb86cb88246d8 | |
parent | c92379506d057f0bf05ebdf0ec4c7a7b81bf22ef [diff] | |
parent | a84a175390c91cd57858f4c539243481d530bfc4 [diff] |
am a84a1753: (-s ours) am 0cffa9fe: am 43f1fe7e: am 5016f769: am b03e1176: (-s ours) am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev * commit 'a84a175390c91cd57858f4c539243481d530bfc4': Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]