commit 8edd7f9a35276ca3e2c284e8b637fce3b7156b32
author Dianne Hackborn <hackbod@google.com> Fri Jun 10 14:00:55 2011 -0700
committer Dianne Hackborn <hackbod@google.com> Fri Jun 10 14:00:55 2011 -0700
tree 5ae6a26a039714ac07bd4627a4670c22a0d9edb3
parent aef9309b4ee4997e362889b94620f9446dc598b6
parent 3f72af13706bc6715f692b8e4879dbb50f818881

resolved conflicts for merge of 3f72af13 to master

Change-Id: I675df80f6e4435e6fb275c8c1527fdc966c0322c

CleanSpec.mk

diff --git a/CleanSpec.mk b/CleanSpec.mk
index b12200e..44cb05e 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -87,6 +87,9 @@
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/YouTube*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_intermediates)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 6fa330d..986dac9 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -53,7 +53,7 @@
   # intermediate builds).  During development, this number remains at the
   # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
   # the code-name of the new development work.
-  PLATFORM_SDK_VERSION := 12
+  PLATFORM_SDK_VERSION := 13
 endif
 
 ifeq "" "$(PLATFORM_VERSION_CODENAME)"