diff options
| author | 2010-05-12 19:06:39 -0700 | |
|---|---|---|
| committer | 2010-05-12 19:06:39 -0700 | |
| commit | 58ed31eafec12e4c4a77405c93671cb888fe837e (patch) | |
| tree | 028086af264a1d96a17a8623d823a1923ba12af9 | |
| parent | a4d5d705ae3531e195f9841a5caaedf71c8bbb9c (diff) | |
| parent | c7e64a8e4bd950b615675f7dce0a0f411f568c7e (diff) | |
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
| -rw-r--r-- | common/java/com/android/common/GoogleLogTags.logtags | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/java/com/android/common/GoogleLogTags.logtags b/common/java/com/android/common/GoogleLogTags.logtags index bf6091a3c4..f848ddfd21 100644 --- a/common/java/com/android/common/GoogleLogTags.logtags +++ b/common/java/com/android/common/GoogleLogTags.logtags @@ -80,7 +80,7 @@ option java_package com.android.common 204004 gtalk_heartbeat_reset (interval_and_nt|1),(ip|3) # 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 |