tree 39e3144dac5d4dd0a3f560f077613809789e765c
parent a184d5e49d173dd5b783a2022b28f45f70b665ee
parent ab20bed75264434f9278c8b0c281b36392f154c6
author bungeman <bungeman@google.com> 1464296624 +0000
committer android-build-merger <android-build-merger@google.com> 1464296624 +0000

merge "SkFontHost_FreeType constructor to correctly release resources." into nyc-dev
am: ab20bed752

* commit 'ab20bed75264434f9278c8b0c281b36392f154c6':
  merge "SkFontHost_FreeType constructor to correctly release resources." into nyc-dev

Change-Id: I1944ae0cd56233ec8926015f37ec93fb494c114f