Robert Greenwalt f96257cbf4 am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 ...

* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
  Trim leading zeros from ipv4 addrs.

2011-12-07 12:31:35 -08:00

..

java/android/net

am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1

2011-12-07 12:31:35 -08: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