tree 26f1d1b10fec448c6a46ba2a7dfec7fc46d01bf2
parent 289f1ffb33d9ab7ed1a7c11bcc70c017b3a1c710
parent b03e1176df1e66a49a5649faf6994fa9ec1a9bea
author Deepanshu Gupta <deepanshu@google.com> 1397673820 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397673820 +0000

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