summaryrefslogtreecommitdiffstats
path: root/core/java/android/content/pm
diff options
context:
space:
mode:
authorkmccormick <kmccormick@google.com>2013-03-28 15:27:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-28 15:27:54 -0700
commit5c3ddcd14b79c4737ea06f68d8efd39543d60382 (patch)
tree8da307a14b962e954a59cd3ec394336773d3b8b4 /core/java/android/content/pm
parentd4b8baf3ed81582bf1b53b263893b2524641868e (diff)
parent425c3d5f59f1e315cdbdd5f7530c4380aabf76ab (diff)
downloadframeworks_base-5c3ddcd14b79c4737ea06f68d8efd39543d60382.zip
frameworks_base-5c3ddcd14b79c4737ea06f68d8efd39543d60382.tar.gz
frameworks_base-5c3ddcd14b79c4737ea06f68d8efd39543d60382.tar.bz2
am 425c3d5f: am 99049335: am 3ed65cb3: am 689e827a: Merge "Doc update: superceeded > superseded" into jb-mr1.1-docs
* commit '425c3d5f59f1e315cdbdd5f7530c4380aabf76ab': Doc update: superceeded > superseded
Diffstat (limited to 'core/java/android/content/pm')
-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);