tree b1978d538433d333d26b2f9f88991f1daf6f091d
parent a39ea5f7d980d381ba3b3b2110d58448968237a3
parent 3dfa720cf15e6b771f70901e7ce44a15d6df05a4
author Jungshik Shin <jungshik@google.com> 1462875938 +0000
committer android-build-merger <android-build-merger@google.com> 1462875938 +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
am: 3dfa720cf1

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

Change-Id: If04b1b561bb5fd4ac30c9f317ab4b535a03b45a9