tree 2b4c5412391bf31f6a54b237ea83bfde05ec3802
parent f2873c598230898219f9481ffb43edc5e4d3f806
parent aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c
author Nick Kralevich <nnk@google.com> 1284661937 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284661937 -0700

am aacb8e13: upgrade freetype to 2.4.2.

Merge commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c'

* commit 'aacb8e1368a883fcbc9fe64fd0e460cef9c9b20c':
  upgrade freetype to 2.4.2.