summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWink Saville <wink@google.com>2010-01-21 12:08:07 -0800
committerWink Saville <wink@google.com>2010-01-21 12:08:07 -0800
commitd89a501f8fff097b023a43e577e2d93e4f6278eb (patch)
tree0a467b24b063657576ae2a641dc7483e1359d1a5
parent37e9e904360d6a8757c958dacaab1343eacb7fa8 (diff)
parent988ad28e7f94fc9e421bc5dc5338022b3ef78957 (diff)
downloadsystem_core-d89a501f8fff097b023a43e577e2d93e4f6278eb.zip
system_core-d89a501f8fff097b023a43e577e2d93e4f6278eb.tar.gz
system_core-d89a501f8fff097b023a43e577e2d93e4f6278eb.tar.bz2
resolved conflicts for merge of 988ad28e to master
Change-Id: I02dda00585d5eb4ea74ca7c77bd46f97bb562440
-rw-r--r--logcat/event.logtags3
1 files changed, 3 insertions, 0 deletions
diff --git a/logcat/event.logtags b/logcat/event.logtags
index 3e68efb..2459604 100644
--- a/logcat/event.logtags
+++ b/logcat/event.logtags
@@ -208,6 +208,9 @@
# CDMA data network drop
50111 cdma_data_drop (cid|1|5), (network_type|1|5)
+# GSM radio access technology switched
+50112 gsm_rat_switched (cid|1|5), (network_from|1|5), (network_to|1|5)
+
# Do not change these names without updating tag in:
#//device/dalvik/libcore/luni/src/main/native/org_apache_harmony_luni_platform_OSNetworkSystem.c
51000 socket_stats (send|1|2),(recv|1|2),(ip|1|5),(port|1|5),(close|1|5)