| commit | d5f550bb2f556c5d287f7c8d2b77223654bcec37 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Wed Jul 13 14:55:30 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 13 14:55:30 2011 -0700 |
| tree | 6fc77f310747adc4bace85a7595508c1ffadb72a | |
| parent | 0b0dd1ca591da7b2d0200e37174affe549bdd302 [diff] | |
| parent | e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72 [diff] |
am e20724c9: resolved conflicts for merge of 3154443d to gingerbread-plus-aosp * commit 'e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72': Change systembuilder tag to optional
diff --git a/Android.mk b/Android.mk index ba187a6..5053e7d 100644 --- a/Android.mk +++ b/Android.mk
@@ -1,3 +1 @@ -ifneq ($(TARGET_SIMULATOR),true) include $(call all-subdir-makefiles) -endif