Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of f6be5a7a to master

Browse Source 
Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
This commit is contained in:
Elliott Hughes
2014-07-09 17:40:24 -07:00
parent 051a3204d4 f6be5a7ac8
commit b58d385e17
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/jni/Android.mk
View File

@@ -179,6 +179,7 @@ LOCAL_C_INCLUDES += \
$(TOP)/frameworks/av/include \
$(TOP)/system/media/camera/include \
$(TOP)/system/netd/include \
external/icu/icu4c/source/common \
external/pdfium/core/include/fpdfapi \
external/pdfium/core/include/fpdfdoc \
external/pdfium/fpdfsdk/include \
@@ -190,8 +191,6 @@ LOCAL_C_INCLUDES += \
external/expat/lib \
external/openssl/include \
external/tremor/Tremor \
external/icu4c/i18n \
external/icu4c/common \
external/jpeg \
external/harfbuzz_ng/src \
external/zlib \