summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author kmccormick <kmccormick@google.com> 2013-03-28 15:30:46 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-03-28 15:30:46 -0700
commit80ab68ce233598ab13a9875fe17d4ec51aa5517b (patch)
tree239357c98409c4d4102c3ccfde1ddb4258817f34
parent7692d1f1654975ef0ef59e6b8dc881299194babf (diff)
parent5c3ddcd14b79c4737ea06f68d8efd39543d60382 (diff)
am 5c3ddcd1: am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '5c3ddcd14b79c4737ea06f68d8efd39543d60382': Doc update: superceeded > superseded
-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 9afbe6fc20c6..da15e3b2d2a9 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -2862,16 +2862,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);