am c1420832: am 5945579e: Merge "Change TrafficStats to a new JNI implementation." into froyo

Merge commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b' into kraken

* commit 'c1420832a8f9c7fa62b143ce63c71062b3969c1b':
  Change TrafficStats to a new JNI implementation.