| commit | 35b5780ec52f3492ae41c36ae30e289bcf78cb11 | [log] [tgz] |
|---|---|---|
| author | Raph Levien <raph@google.com> | Thu Jan 29 22:36:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 22:36:46 2015 +0000 |
| tree | b691419341506b1ba59913b67ed98de17ad97102 | |
| parent | f19485b644b7ba7bda1f5c7a2279ca56c37923f0 [diff] | |
| parent | 2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627 [diff] |
am 2ed9a7e5: am af461e12: Merge "Refine resolution order for typeface and fontFamily" into lmp-mr1-dev * commit '2ed9a7e5ac3923b9459dc02b3a04e075ae4ea627': Refine resolution order for typeface and fontFamily