tree 0e443679e800bb442b2cbb2f7ae086b787ca65ff
parent cebcd4410c151fc7cf6c180aa15e482da140f9c5
author Xin Li <delphij@google.com> 1486509550 -0800
committer Feng Yu <feny@google.com> 1487125377 +0000

Merge commit '055aee28cedc3' into klp-dev:

Update FreeType from 2.6.2 to c38be52bf8de (2.7 + a few post-2.7 CLs)

BUG: 31470908
Change-Id: I93358ebb4661044c7223c93ae171bc47be4a5715
Merged-In: I1ca90aec171d9580415b8531e2b767e9dd31164c