tree 39e3144dac5d4dd0a3f560f077613809789e765c
parent 7e0227039795fdc9891b14697f54b888d7f69fb6
parent 7b25547e8910797642844d00a867f6662f8ea1a6
author bungeman <bungeman@google.com> 1464296759 +0000
committer android-build-merger <android-build-merger@google.com> 1464296759 +0000

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

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

Change-Id: I197fb338ebdee4acb11277c4475a0946a36fc0cb