Jeff Sharkey 9293bbee48 Merge "Hide NetworkStatsHistory internals."

2011-07-12 15:19:31 -07:00

..

java/android/net

Hide NetworkStatsHistory internals.

2011-07-12 13:57:06 -07:00

jni

resolved conflicts for merge of 99cd6671 to master

2011-07-12 13:56:05 -07:00