tree b1978d538433d333d26b2f9f88991f1daf6f091d
parent 00e93e2e6212de8ba262ee186fdb6ef71994e1ae
parent dd8ffe5348cef32ba37b33d199d4272adf5f918e
author Jungshik Shin <jungshik@google.com> 1462839298 +0000
committer android-build-merger <android-build-merger@google.com> 1462839298 +0000

[DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3 am: 36b415ed6c  -s ours am: 7d195cc027 am: e357c551c6 am: 071298add4  -s ours am: 0cfbc24ba6 am: 162a60bdb9 am: df1aa4e401 am: 963f3505a4  -s ours
am: dd8ffe5348

* commit 'dd8ffe5348cef32ba37b33d199d4272adf5f918e':
  [DO NOT MERGE] Update FreeType to 2.6.2+update from 2.5.3

Change-Id: If33bbc833d23455c8b0be05fdfcab6668edaee8e