| commit | 23b7bc1b4409ca5844db5f17992b906aa3e63927 | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Thu Sep 19 10:57:00 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 19 10:57:00 2013 -0700 |
| tree | 2ba2b173e813e73a037bd1fc08840222f3cd864b | |
| parent | be64336477bf3445da13b29236b6aa038d053daf [diff] | |
| parent | a2c6209f6120d300cd28d97ec868b5cabb3ee1a9 [diff] |
am a2c6209f: Merge "Update SkTypeface::CreateFromName to handle NULL if familyName does not match" into klp-dev * commit 'a2c6209f6120d300cd28d97ec868b5cabb3ee1a9': Update SkTypeface::CreateFromName to handle NULL if familyName does not match