summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorCostin Manolache <costin@google.com>2010-05-11 11:42:58 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-05-11 11:42:58 -0700
commite2055fe4258f8085a88328579c852ec26d77bb10 (patch)
tree26093b4255098ee542d0539031b710d5e4c5f364 /core/java/android
parent3e90c76c12803cd1b116030fd124b7b870d25342 (diff)
parent161c75a0f3ca5255001f7d737a02a4f9d728f1f4 (diff)
downloadframeworks_base-e2055fe4258f8085a88328579c852ec26d77bb10.zip
frameworks_base-e2055fe4258f8085a88328579c852ec26d77bb10.tar.gz
frameworks_base-e2055fe4258f8085a88328579c852ec26d77bb10.tar.bz2
Merge "Bug 2673557: rename datamessaging" into froyo
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/Intent.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index ed548c5..6aac4b9 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -1866,7 +1866,7 @@ public class Intent implements Parcelable, Cloneable {
* @hide
*/
public static final String ACTION_REMOTE_INTENT =
- "com.google.android.pushmessaging.intent.RECEIVE";
+ "com.google.android.datamessaging.intent.RECEIVE";
/**
* Broadcast Action: hook for permforming cleanup after a system update.