diff options
| author | Justin Ho <justinho@google.com> | 2011-10-10 16:46:35 -0700 |
|---|---|---|
| committer | Justin Ho <justinho@google.com> | 2011-10-10 16:46:35 -0700 |
| commit | 882ed3747145ca68b3acb26636be7a39755b5548 (patch) | |
| tree | b19e69a0d5055b0bf4c001f0b43c47bbd3be230f /CleanSpec.mk | |
| parent | 2cba116c27f52fa7545d5131ff9e18294d87e81a (diff) | |
| parent | 83cf0313075d41b602fdbd808cd06a6efd40a43a (diff) | |
| download | frameworks_base-882ed3747145ca68b3acb26636be7a39755b5548.zip frameworks_base-882ed3747145ca68b3acb26636be7a39755b5548.tar.gz frameworks_base-882ed3747145ca68b3acb26636be7a39755b5548.tar.bz2 | |
Resolved conflicts for merge of 83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
Diffstat (limited to 'CleanSpec.mk')
| -rw-r--r-- | CleanSpec.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 9381437..fb334fc 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -116,6 +116,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/DroidSans*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ |