tree b1978d538433d333d26b2f9f88991f1daf6f091d
parent f5761550445bf8f3804ccc188bff122f0f0765de
parent 4ef1089965fbed7256cbf2d6d91c93276cbe25e9
author Jungshik Shin <jungshik@google.com> 1462840295 +0000
committer android-build-merger <android-build-merger@google.com> 1462840295 +0000

Merge "[DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0" into mnc-dev am: 219e246447 am: cf4d9f4ed4 am: 67b57610bd am: 08cec17454  -s ours
am: 4ef1089965

* commit '4ef1089965fbed7256cbf2d6d91c93276cbe25e9':
  [DO NOT MERGE] Update FreeType to 2.6.2 + update from 2.6.0

Change-Id: Ib05fabbea500006665f94e4a4fb6ac8e5982441f