resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp

Change-Id: Idddf7afb063109654664ecac252cf6be73125c20

core/tasks/sdk-addon.mk

+0 −1

Original line number	Diff line number	Diff line
		@@ -110,4 +110,3 @@ ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)
		$(error Trying to build sdk_addon, but product '$(INTERNAL_PRODUCT)' does not define one)
		endif
		endif # addon_name