summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-28 22:21:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-03-28 22:21:12 +0000
commit689e827aa3fa69d20087972dfb93ed257e4d109b (patch)
tree84d1d5cde1c46684a609e43190bdd77ab19610a8 /core
parentf65b5d085bc62382eba530179a24a1cf1a7d353d (diff)
parentac66b85a0454793502a12926bddf70b16a0dfd7d (diff)
downloadframeworks_base-689e827aa3fa69d20087972dfb93ed257e4d109b.zip
frameworks_base-689e827aa3fa69d20087972dfb93ed257e4d109b.tar.gz
frameworks_base-689e827aa3fa69d20087972dfb93ed257e4d109b.tar.bz2
Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
Diffstat (limited to 'core')
-rw-r--r--core/java/android/content/pm/PackageManager.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 956c47e..2c31ea0 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2701,16 +2701,16 @@ public abstract class PackageManager {
/**
* @deprecated This function no longer does anything; it was an old
- * approach to managing preferred activities, which has been superceeded
- * (and conflicts with) the modern activity-based preferences.
+ * approach to managing preferred activities, which has been superseded
+ * by (and conflicts with) the modern activity-based preferences.
*/
@Deprecated
public abstract void addPackageToPreferred(String packageName);
/**
* @deprecated This function no longer does anything; it was an old
- * approach to managing preferred activities, which has been superceeded
- * (and conflicts with) the modern activity-based preferences.
+ * approach to managing preferred activities, which has been superseded
+ * by (and conflicts with) the modern activity-based preferences.
*/
@Deprecated
public abstract void removePackageFromPreferred(String packageName);