am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo

Merge commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e' into froyo-plus-aosp

* commit '8ea9f130d24a7dd1e505ba0cf437bdd8a660975e':
  Bug 2680071: Rename the Cloud to Device
This commit is contained in:
Costin Manolache
2010-05-12 19:06:39 -07:00
committed by Android Git Automerger
3 changed files with 6 additions and 6 deletions

View File

@@ -1866,7 +1866,7 @@ public class Intent implements Parcelable, Cloneable {
* @hide
*/
public static final String ACTION_REMOTE_INTENT =
"com.google.android.datamessaging.intent.RECEIVE";
"com.google.android.c2dm.intent.RECEIVE";
/**
* Broadcast Action: hook for permforming cleanup after a system update.