diff options
| author | Wink Saville <wink@google.com> | 2012-08-04 08:07:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-04 08:07:54 -0700 |
| commit | 8f82961f5ace376cb2f888f8d4e53fe8a49f7315 (patch) | |
| tree | cf56afb9927d7e49909e0dfdfee13830116a5963 | |
| parent | 1971df5d4296f077cccff704201057a32b733235 (diff) | |
| parent | 98853623bcb27155e9b030301a0cb2a987cfc612 (diff) | |
| download | frameworks_base-8f82961f5ace376cb2f888f8d4e53fe8a49f7315.zip frameworks_base-8f82961f5ace376cb2f888f8d4e53fe8a49f7315.tar.gz frameworks_base-8f82961f5ace376cb2f888f8d4e53fe8a49f7315.tar.bz2 | |
am 98853623: Merge "Telephony: Move AdnRecord.aidl into opt/telephony"
* commit '98853623bcb27155e9b030301a0cb2a987cfc612':
Telephony: Move AdnRecord.aidl into opt/telephony
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/AdnRecord.aidl | 20 |
2 files changed, 1 insertions, 20 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 0d8a7cd..61e5b4c 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -133,6 +133,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.P) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClient.P) $(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/Disco*) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/telephony/java/com/android/internal/telephony/AdnRecord.aidl b/telephony/java/com/android/internal/telephony/AdnRecord.aidl deleted file mode 100644 index b4a1a29..0000000 --- a/telephony/java/com/android/internal/telephony/AdnRecord.aidl +++ /dev/null @@ -1,20 +0,0 @@ -/* -** Copyright 2007, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ - -package com.android.internal.telephony; - -parcelable AdnRecord; - |