Jeff Sharkey ac0fb9c578 am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1 ...

* commit 'bc03c74c485669695805944a655795a6f9890956':
  Conservatively trim data usage stats.

2011-11-15 11:30:34 -08:00

..

java/android/net

docs: some helpful javadocs for network info

2011-10-06 19:26:48 -07:00

jni

resolved conflicts for merge of a3b4b5ca to master

2011-07-08 12:49:14 -07:00

tests/coretests

Conservatively trim data usage stats.

2011-11-14 20:11:38 -08:00