commit aba9adcf1ed71d3dd02b9976506fc3409fc2c56e
author jungshik <jungshik@google.com> Mon Jan 18 12:13:55 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jan 18 12:13:55 2016 +0000
tree b1978d538433d333d26b2f9f88991f1daf6f091d
parent d57fa79d705368aa82569420e4d89d23fd49377b
parent 638ea6c2028a6b5b961f07508b0e1e14d7dc62b8

Merge "Update the version number in Android.mk"
am: 638ea6c202

* commit '638ea6c2028a6b5b961f07508b0e1e14d7dc62b8':
  Update the version number in Android.mk

Android.mk

diff --git a/Android.mk b/Android.mk
index b2b780b..138ac69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,10 @@
 # this is now the default FreeType build for Android
 #
 ifndef USE_FREETYPE
-USE_FREETYPE := 2.6.0
+USE_FREETYPE := 2.6.2
 endif
 
-ifeq ($(USE_FREETYPE),2.6.0)
+ifeq ($(USE_FREETYPE),2.6.2)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)