| commit | 3963cb45d12e179f851a5f3586548207b781bfa5 | [log] [tgz] |
|---|---|---|
| author | Meng Wang <mewan@google.com> | Wed Nov 27 13:34:51 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Nov 27 13:34:51 2019 -0800 |
| tree | 3dad74c60ae5326a627a928c9dc16610dde6737e | |
| parent | 9b84a44f04d0a86beadfebd2d5c23e84bc4d122f [diff] | |
| parent | 306786abd496f026a03312162a208df35fa2d785 [diff] |
Merge "Move CarrierIdentifier/CarrierService to telephony" am: 306786abd4 Change-Id: I20c8065c746f4ce025ef45ef4dc6ad0726f83b22
diff --git a/core/java/android/service/carrier/CarrierIdentifier.aidl b/telephony/java/android/service/carrier/CarrierIdentifier.aidl similarity index 100% rename from core/java/android/service/carrier/CarrierIdentifier.aidl rename to telephony/java/android/service/carrier/CarrierIdentifier.aidl
diff --git a/core/java/android/service/carrier/CarrierIdentifier.java b/telephony/java/android/service/carrier/CarrierIdentifier.java similarity index 100% rename from core/java/android/service/carrier/CarrierIdentifier.java rename to telephony/java/android/service/carrier/CarrierIdentifier.java
diff --git a/core/java/android/service/carrier/CarrierService.java b/telephony/java/android/service/carrier/CarrierService.java similarity index 100% rename from core/java/android/service/carrier/CarrierService.java rename to telephony/java/android/service/carrier/CarrierService.java
diff --git a/core/java/android/service/carrier/ICarrierService.aidl b/telephony/java/android/service/carrier/ICarrierService.aidl similarity index 100% rename from core/java/android/service/carrier/ICarrierService.aidl rename to telephony/java/android/service/carrier/ICarrierService.aidl