Robert Greenwalt 0b3d2a85b1 am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1 ...

* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
  Trim leading zeros from ipv4 addrs.

2011-12-07 12:33:24 -08:00

..

java/android/net

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

2011-12-07 12:33:24 -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