resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

Change-Id: I3665ae5778120499117806e7301a7be6dfff91cf
This commit is contained in:
Ying Wang 2011-03-09 17:02:35 -08:00
commit f8a7ff191a
1 changed files with 4 additions and 3 deletions

View File

@ -830,9 +830,10 @@ ALL_SDK_TARGETS := $(INTERNAL_SDK_TARGET)
sdk: $(ALL_SDK_TARGETS)
ifneq ($(filter sdk win_sdk,$(MAKECMDGOALS)),)
$(call dist-for-goals,sdk win_sdk, \
$(ALL_SDK_TARGETS) \
$(SYMBOLS_ZIP) \
)
$(ALL_SDK_TARGETS) \
$(SYMBOLS_ZIP) \
$(INSTALLED_BUILD_PROP_TARGET) \
)
endif
.PHONY: samplecode