| commit | 852d72b28e6d7d0e6372a9b544641817338002e6 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Tue Nov 01 20:29:42 2011 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 01 20:29:42 2011 +0000 |
| tree | 5c63bf53310df1bfb34b56e97b618ced82ed7254 | |
| parent | 7775f52e4aa7703a5721378f5a1103d9486af895 [diff] | |
| parent | bd9b1528051a1b257768fdbc5077a2d4473b02dd [diff] |
am bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0 * 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 index c22b071..7a61432 100644 --- a/core/jni/android_net_TrafficStats.cpp +++ b/core/jni/android_net_TrafficStats.cpp
@@ -68,6 +68,7 @@ "rmnet1", "rmnet2", "rmnet3", + "cdma_rmnet4", "ppp0", 0 };