tree a1696fc12a455407a8dd583a8da1c02a3ec18861
parent ac3d58cff7c80b0ef56bf55130d91da17cbaa3c4
parent 20d72bb21b9b99730924fd36ec07443c7a613b91
author Jungshik Shin <jungshik@google.com> 1462839947 +0000
committer android-build-merger <android-build-merger@google.com> 1462839947 +0000

[DO NOT MERGE] Fix the way FreeType headers are incldued. am: 5022fbe8a4 am: 73ff57d02c am: 5ee8e0cdc1 am: 4f87508a47  -s ours am: 64aaa625fb
am: 20d72bb21b

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

Change-Id: I8431bd6e7b9abb54e76a064a968c3cecce633c55