| commit | dc3324602a1bd17bd83f691f8f7a2f62283194e7 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed Nov 02 06:46:08 2011 -0700 |
| committer | The Android Automerger <android-build@android.com> | Wed Nov 02 06:46:08 2011 -0700 |
| tree | ab2ecb2492db83641fd41ea5bf81f05514b28ed9 | |
| parent | 061658c2c7f62cdaa88a4cad4d026e99638f4d0f [diff] | |
| parent | 78e89a0cd89c03e9fea7d046033bbff0ffee61cc [diff] |
merge in ics-mr1-release history after reset to ics-mr1
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 };