summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-14 06:21:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2019-12-14 06:21:56 +0000
commit3559b773a2e3624807abd0350d50ae61e27f11d0 (patch)
tree1f05b0c353be70107f3bed404cbd50d37f389232
parentb6c05be16d5128377ebd807ad49c34e3153e7ac3 (diff)
parentbcec691fd15b8f72592b975e8c83599ec57460a0 (diff)
Merge changes from topic "cpcpcp" am: b25174e9d0 am: bcec691fd1
Change-Id: I8e9c1c4e99969342a339501ffe05023d82353387
-rw-r--r--telephony/common/com/android/internal/telephony/EncodeException.java (renamed from telephony/java/com/android/internal/telephony/EncodeException.java)0
1 files changed, 0 insertions, 0 deletions
diff --git a/telephony/java/com/android/internal/telephony/EncodeException.java b/telephony/common/com/android/internal/telephony/EncodeException.java
index cdc853e09895..cdc853e09895 100644
--- a/telephony/java/com/android/internal/telephony/EncodeException.java
+++ b/telephony/common/com/android/internal/telephony/EncodeException.java