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

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

2011-11-15 09:25:40 -08:00

..

java/android/net

store the hw addr in the extraInfo field of ethernet NetworkInfos

2011-11-03 12:45:42 -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