summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Meng Wang <mewan@google.com> 2019-11-27 13:44:06 -0800
committer android-build-merger <android-build-merger@google.com> 2019-11-27 13:44:06 -0800
commit472a065d93f9cd45e4d3fbd5ad4eef8c38809ffd (patch)
tree0e888c0d61b1428e930bbd1667c006920a1bc4f6
parent7c53c0dcc38571e758012b98e9b4abe7c8444c86 (diff)
parentfba2c8041a6d40e5f0fa15595cec50d033763d19 (diff)
Merge "Move android.provider.Telephony to frameworks/base/core" am: 4d0df870cd am: 9b84a44f04
am: fba2c8041a Change-Id: I9aab1a8bfe10a2fd661e0bd19452b4a66f6e1a2f
-rw-r--r--core/java/android/provider/Telephony.java (renamed from telephony/java/android/provider/Telephony.java)0
1 files changed, 0 insertions, 0 deletions
diff --git a/telephony/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java
index add03160bbe9..add03160bbe9 100644
--- a/telephony/java/android/provider/Telephony.java
+++ b/core/java/android/provider/Telephony.java