diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-06 11:50:47 -0800 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-12-06 11:50:47 -0800 |
| commit | 089c3c7c0bea4610a5dcb9653e8ddfe06c101318 (patch) | |
| tree | 358387e43ec6af760a5bce75dc86e444ee7c2210 /CleanSpec.mk | |
| parent | 38dab454d151423faa9eb8c17f9cb8579f5e79c8 (diff) | |
| parent | 28e8c66d4bb0c6e13b65d48767851dd02d554ebb (diff) | |
| download | frameworks_base-089c3c7c0bea4610a5dcb9653e8ddfe06c101318.zip frameworks_base-089c3c7c0bea4610a5dcb9653e8ddfe06c101318.tar.gz frameworks_base-089c3c7c0bea4610a5dcb9653e8ddfe06c101318.tar.bz2 | |
resolved conflicts for merge of 28e8c66d to master
Change-Id: I9746fd7478d3954b491179ffbd241f481cc2fb6c
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 c7bd9fd..15e073e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -86,6 +86,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/androi $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/trustedlogic) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/src/com/trustedlogic) $(call add-clean-step, rm -rf $(OUT_DIR)/target/target/common/obj/APPS/Music2_intermediates) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/nfc/INdefTag.java) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST |