tree 6c3887e955cc1fe62492181758e889d4e25dc773
parent ecd485409c687ad4ed53e1d26cc06788861e030f
parent 209139b7a064ee5ff783d10efad4d04027c6b3d6
author Jungshik Shin <jungshik@google.com> 1455667994 +0000
committer android-build-merger <android-build-merger@google.com> 1455667994 +0000

[DO NOT MERGE] Fix the way FreeType headers are incldued.
am: 209139b7a0  -s ours

* commit '209139b7a064ee5ff783d10efad4d04027c6b3d6':
  [DO NOT MERGE] Fix the way FreeType headers are incldued.