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

Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
This commit is contained in:
Ying Wang 2011-03-31 18:05:37 -07:00
commit a9be570b5d
1 changed files with 0 additions and 1 deletions

View File

@ -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