Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58ed31ea authored by Costin Manolache's avatar Costin Manolache Committed by Android Git Automerger
Browse files

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
parents a4d5d705 c7e64a8e
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -80,7 +80,7 @@ option java_package com.android.common
204004 gtalk_heartbeat_reset (interval_and_nt|1),(ip|3)
204004 gtalk_heartbeat_reset (interval_and_nt|1),(ip|3)


# This event is logged when an Rmq v2 packet is sent or received.
# This event is logged when an Rmq v2 packet is sent or received.
204005 data_messaging (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)
204005 c2dm (packet_type|1),(persistent_id|3),(stream_id|1),(last_stream_id|1)


#####
#####
# Google Login Service and Setup Wizard
# Google Login Service and Setup Wizard