diff options
| author | Justin Ho <justinho@google.com> | 2011-10-03 17:06:26 -0700 |
|---|---|---|
| committer | Justin Ho <justinho@google.com> | 2011-10-03 17:06:26 -0700 |
| commit | d5b9b26081b09ecd1a9701e3320bf969ae481f66 (patch) | |
| tree | 527a2e21938f9f673396817281dc3114307afb6b /CleanSpec.mk | |
| parent | 7c2d205298efcc81f6c48ee1605eae12f7d0f7fe (diff) | |
| parent | 121e805af449ccee802ae0001f4d8eaf531e6b2d (diff) | |
| download | frameworks_base-d5b9b26081b09ecd1a9701e3320bf969ae481f66.zip frameworks_base-d5b9b26081b09ecd1a9701e3320bf969ae481f66.tar.gz frameworks_base-d5b9b26081b09ecd1a9701e3320bf969ae481f66.tar.bz2 | |
Resolve conflicts for merge 121e805a to master
Conflicts:
CleanSpec.mk
Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676
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 eb8471a..1c85279 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -114,6 +114,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/media/audio/) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/fonts/Lohit_Hindi.ttf) $(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 # ************************************************ |