diff options
author | jungshik <jungshik@google.com> | 2016-01-18 12:13:55 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-18 12:13:55 +0000 |
commit | aba9adcf1ed71d3dd02b9976506fc3409fc2c56e (patch) | |
tree | b1978d538433d333d26b2f9f88991f1daf6f091d | |
parent | d57fa79d705368aa82569420e4d89d23fd49377b (diff) | |
parent | 638ea6c2028a6b5b961f07508b0e1e14d7dc62b8 (diff) | |
download | freetype-android-cts-7.0_r16.tar.gz |
Merge "Update the version number in Android.mk"android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-cts-releasenougat-bugfix-release
am: 638ea6c202
* commit '638ea6c2028a6b5b961f07508b0e1e14d7dc62b8':
Update the version number in Android.mk
-rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index b2b780b6a..138ac69b9 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) |