tree bdb1068e64623c623100071dc586117aba4a2417
parent 67b57610bd5cb9508383d7ba83587eebe26303da
parent 37595e7d77511d1ec36a9161c236f681cac437a4
author Jungshik Shin <jungshik@google.com> 1462874721 +0000
committer android-build-merger <android-build-merger@google.com> 1462874721 +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

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

Change-Id: I48af4b74175b9b365fda1bf5d36714665cd2504f