diff options
| author | Ying Wang <wangying@google.com> | 2011-03-31 18:05:37 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-31 18:05:37 -0700 |
| commit | a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1 (patch) | |
| tree | e51b82cf031fe35fe962d0892c8bc612acc4af76 | |
| parent | ce4670977d0367983e40ed339da793792fdb6e06 (diff) | |
| parent | fdc3192e6853ed92ec44653a609d386088bbb6d9 (diff) | |
| download | build-a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1.zip build-a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1.tar.gz build-a9be570b5d5351bc13da1cbc0a5be3a6ea1113d1.tar.bz2 | |
resolved conflicts for merge of fdc3192e to honeycomb-plus-aosp
Change-Id: Idddf7afb063109654664ecac252cf6be73125c20
| -rw-r--r-- | core/tasks/sdk-addon.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/core/tasks/sdk-addon.mk b/core/tasks/sdk-addon.mk index e1a8c0b..797314a 100644 --- a/core/tasks/sdk-addon.mk +++ b/core/tasks/sdk-addon.mk @@ -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 - |