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

Commit 01cab9ce authored by Elliott Hughes's avatar Elliott Hughes
Browse files

resolved conflicts for merge of 373e21cc to master 

Change-Id: I91afd8f9cba04559d21e1c84e25c5c60c990165d
parents bc2fb720 373e21cc

media/libmedia/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ LOCAL_MODULE:= libmedia 


LOCAL_C_INCLUDES := \

    $(TOP)/frameworks/native/include/media/openmax \

    external/icu4c/common \

    external/icu4c/i18n \

    external/icu/icu4c/source/common \

    external/icu/icu4c/source/i18n \

    $(call include-path-for, audio-effects) \

    $(call include-path-for, audio-utils)