| commit | 8fa4e29f167af0d0541f496e1bb24f6a6af75e9d | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Fri Sep 20 09:57:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 20 09:57:42 2013 -0700 |
| tree | 5e2977e3186a760b4783df6d6ff344fa6179a8c2 | |
| parent | 457767d267c02dcf818b730de03d55c9b8edabb0 [diff] | |
| parent | 23b7bc1b4409ca5844db5f17992b906aa3e63927 [diff] |
am 23b7bc1b: am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev * commit '23b7bc1b4409ca5844db5f17992b906aa3e63927': Update SkTypeface::CreateFromName to handle NULL if familyName does not match