am bd9b152: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0

Robert Greenwalt · Android Git Automerger · commit 852d72b28e6d · 2011-11-01T20:29:42.000Z
* commit 'bd9b1528051a1b257768fdbc5077a2d4473b02dd':
  Add cdma_rmnet4 to list of monitored interfaces
diff --git a/core/jni/android_net_TrafficStats.cpp b/core/jni/android_net_TrafficStats.cpp
@@ -68,6 +68,7 @@ static const char* mobile_iface_list[] = {
     "rmnet1",
     "rmnet2",
     "rmnet3",
+    "cdma_rmnet4",
     "ppp0",
     0
 };

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,7 @@ static const char* mobile_iface_list[] = {`
`68`	`68`	`"rmnet1",`
`69`	`69`	`"rmnet2",`
`70`	`70`	`"rmnet3",`
	`71`	`+ "cdma_rmnet4",`
`71`	`72`	`"ppp0",`
`72`	`73`	`0`
`73`	`74`	`};`