resolved conflicts for merge of 3ad1145a to master

Change-Id: I13159b95f90c5095373951bf9e91b7dbf8b14558

native/jni/Android.mk

+4 −0

Original line number	Diff line number	Diff line
		@@ -51,6 +51,10 @@ ifeq ($(TARGET_ARCH), x86)
		TARGETING_UNBUNDLED_FROYO := false
		endif

		ifeq ($(TARGET_ARCH), mips)
		TARGETING_UNBUNDLED_FROYO := false
		endif

		ifeq ($(FLAG_DBG), true)
		TARGETING_UNBUNDLED_FROYO := false
		endif