summaryrefslogtreecommitdiffstats
path: root/core/java/android/provider
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2012-03-05 22:55:39 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-05 22:55:39 -0800
commitcd83bf9420a7c4c25d562b197438f532ad897c90 (patch)
treea7271528d93342cc122ea396d07b177b43d70ae4 /core/java/android/provider
parentf515f649637e7b389a8ab1aebc23462c7b12503b (diff)
parent4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219 (diff)
downloadframeworks_base-cd83bf9420a7c4c25d562b197438f532ad897c90.zip
frameworks_base-cd83bf9420a7c4c25d562b197438f532ad897c90.tar.gz
frameworks_base-cd83bf9420a7c4c25d562b197438f532ad897c90.tar.bz2
am 4d7bc655: Doc change: String changes for Android Market
* commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
Diffstat (limited to 'core/java/android/provider')
-rw-r--r--core/java/android/provider/Settings.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 987e53c..af2d59a 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -2605,10 +2605,10 @@ public final class Settings {
/**
* Whether the package installer should allow installation of apps downloaded from
- * sources other than the Android Market (vending machine).
+ * sources other than Google Play.
*
* 1 = allow installing from other sources
- * 0 = only allow installing from the Android Market
+ * 0 = only allow installing from Google Play
*/
public static final String INSTALL_NON_MARKET_APPS = "install_non_market_apps";