Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp * commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b': Change TrafficStats to a new JNI implementation.
Merge commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b' into froyo-plus-aosp * commit '5945579e4ed8fbe6dae6adaa4c222b321c2ec80b': Change TrafficStats to a new JNI implementation.