tree 86c9ee0214cac2870a94905e4240732413ed768b
parent 071298add4f54763c777e52eca35bcad0df4c734
parent 707d74caa5c30762a89b6a9ab1cf82210482c806
author Jungshik Shin <jungshik@google.com> 1462873516 +0000
committer android-build-merger <android-build-merger@google.com> 1462873516 +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

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

Change-Id: I0d66eedbe171de6d50993718afda3050346fb33c