resolved conflicts for merge of f739e312 to master
Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
diff --git a/CleanSpec.mk b/CleanSpec.mk
index af90039..5410b8b 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -48,6 +48,10 @@
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmediaplayerservice_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libmedia_jni_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libstagefright_omx_intermediates)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************