tree 720489aa1d9176e568acf0f8cb441a3f8cb0663f
parent ec53de77a7ec24f862372a39333f8e91708a806d
parent bff90fb5ec88ad7fdfb6d1d2f5a5719c20a2c5dc
author Geremy Condra <gcondra@google.com> 1321567684 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1321567684 -0800

Merge "DO NOT MERGE Update FreeType library to 2.4.7"