tree fe4de8b0a042ada83940954a78b1c0118183e4fb
parent 38f2b1ea4146a52f167d1a73e705590266848336
parent 43f1fe7e5e625f9de515220f375c18db5b5476cd
author Deepanshu Gupta <deepanshu@google.com> 1397675797 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397675797 +0000

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 '43f1fe7e5e625f9de515220f375c18db5b5476cd':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]