summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-13 17:37:48 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-03-13 17:37:48 +0000
commit942bc62c4f3878a17cb1e921a301a7eed47a5962 (patch)
tree55aceb29a5aabd7d31ebc54371f358d358d43cd2
parent60eb33e4f04ca0331afb04872b4d4ed634c97f6b (diff)
parent9f734461f9e3b82686fcc2bbbf1f431613a9c76c (diff)
Merge "Merge "Fix typo in android.telecom.Connection." am: c8b5936fea am: f2ff682b07" into tm-qpr-dev-plus-aosp
-rw-r--r--telecomm/java/android/telecom/Connection.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java
index 49ad58550db8..7c60f81259c7 100644
--- a/telecomm/java/android/telecom/Connection.java
+++ b/telecomm/java/android/telecom/Connection.java
@@ -82,7 +82,7 @@ import java.util.concurrent.ConcurrentHashMap;
* must call {@link #destroy()} to signal to the framework that the {@code Connection} is no
* longer used and associated resources may be recovered.
* <p>
- * Subclasses of {@code Connection} override the {@code on*} methods to provide the the
+ * Subclasses of {@code Connection} override the {@code on*} methods to provide the
* {@link ConnectionService}'s implementation of calling functionality. The {@code on*} methods are
* called by Telecom to inform an instance of a {@code Connection} of actions specific to that
* {@code Connection} instance.