| commit | 364c0a34ff006b24a4d455acdb6479e5dc82505f | [log] [tgz] |
|---|---|---|
| author | Raph Levien <raph@google.com> | Thu Jan 29 22:33:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 22:33:14 2015 +0000 |
| tree | 78ea2b410fd805b1f023a5806da1a81df45f996f | |
| parent | 855f8a2aa36c974a190d52aa09f5334bbb0e4e02 [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