Merge f6b2aa16 on remote branch

Change-Id: Ib31e88d00fb62e12ac1f6c59784efe75f86954b3

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		ifeq (0, 1)
		ifeq ($(TARGET_FWK_SUPPORTS_FULL_VALUEADDS),true)
		LOCAL_PATH:= $(call my-dir)

		@@ -65,3 +66,4 @@ include $(call all-makefiles-under, $(LOCAL_PATH))

		endif
		endif
		endif