tree b1978d538433d333d26b2f9f88991f1daf6f091d
parent 4ef1089965fbed7256cbf2d6d91c93276cbe25e9
parent 2fc1f401eab7d7d5e130b3662e7c67deb0cc1abb
author Jungshik Shin <jungshik@google.com> 1462875537 +0000
committer android-build-merger <android-build-merger@google.com> 1462875537 +0000

[DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12 am: 42a6868914 am: d55dd850cb am: 52b3a17d26  -s ours am: 6aebab2093  -s ours am: e85ef9a043 am: 707d74caa5 am: 8e942bf7e5  -s ours am: 56586be400 am: 37595e7d77 am: 81954b2f2f
am: 2fc1f401ea  -s ours

* commit '2fc1f401eab7d7d5e130b3662e7c67deb0cc1abb':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.4.12

Change-Id: I022e745dbc9ccc144b05f877629341b019fadbcf