Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b58d385e authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of f6be5a7a to master 

Change-Id: I6dcfb33981df90877fb9f3752b853cf377633edf
parents 051a3204 f6be5a7a

core/jni/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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 \