tree fd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a
parent 43e229a111147eca7c7fb7a4623d2d04a4df4b43
parent 0cffa9fe6c796c69d143493aede11e3f1321262e
author Deepanshu Gupta <deepanshu@google.com> 1397677471 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677471 +0000

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