summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorNathan Harold <nharold@google.com>2015-06-08 20:04:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-08 20:05:07 +0000
commit71feb72b76777afa10dca555287f954d63deeb9d (patch)
tree43a7a789d1c8673f420453906077ba02155b1695 /telephony
parent5ac36cea8611d15027c4353e3c8ef932d6ad437a (diff)
parentfde06fd323fbc7102a824e1b8a2b9ddc4a89c38a (diff)
downloadframeworks_base-71feb72b76777afa10dca555287f954d63deeb9d.zip
frameworks_base-71feb72b76777afa10dca555287f954d63deeb9d.tar.gz
frameworks_base-71feb72b76777afa10dca555287f954d63deeb9d.tar.bz2
Merge "Fix a typo in the docstring of getAllCellInfo()" into mnc-dev
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index f5a7c0f..86f7ec3 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -2756,7 +2756,7 @@ public class TelephonyManager {
* The list can include one or more of {@link android.telephony.CellInfoGsm CellInfoGsm},
* {@link android.telephony.CellInfoCdma CellInfoCdma},
* {@link android.telephony.CellInfoLte CellInfoLte} and
- * {@link android.telephony.CellInfoWcdma CellInfoCdma} in any combination.
+ * {@link android.telephony.CellInfoWcdma CellInfoWcdma} in any combination.
* Specifically on devices with multiple radios it is typical to see instances of
* one or more of any these in the list. In addition 0, 1 or more CellInfo
* objects may return isRegistered() true.