tree fa960ac99e4918b56e141e523430499f3d753c69
parent 90b0b69cd48067b92a90ea248ef91e473b7f1c10
parent 533a52fe3bedc88483a968400cd61110bd29c704
author Deepanshu Gupta <deepanshu@google.com> 1397673630 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397673630 +0000

am 533a52fe: am b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev

* commit '533a52fe3bedc88483a968400cd61110bd29c704':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]