| commit | 2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627 | [log] [tgz] |
|---|---|---|
| author | Raph Levien <raph@google.com> | Thu Jan 29 22:25:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 22:25:51 2015 +0000 |
| tree | 0c7f2611d6a850f770133b00630bfaf2b21f0aeb | |
| parent | 60e4edfb94fd744001b4c7013a89ef4abb311f97 [diff] | |
| parent | af461e12a12dba8fc544fa373831368ba2c18096 [diff] |
am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev * commit 'af461e12a12dba8fc544fa373831368ba2c18096': Refine resolution order for typeface and fontFamily