am 904a4b7a: am 8250530c: Merge change I194f0808 into eclair-mr2
Merge commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7'
* commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7':
Add Gservices flag so that Market can turn on performance logging for specific groups.
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 819f3a0..1c52cf3 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3296,6 +3296,12 @@
"vending_carrier_cred_buf_ms";
/**
+ * Whether to turn on performance logging in the Market client.
+ */
+ public static final String VENDING_LOG_PERFORMANCE =
+ "vending_log_perf";
+
+ /**
* URL that points to the legal terms of service to display in Settings.
* <p>
* This should be a https URL. For a pretty user-friendly URL, use