diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2009-09-25 08:44:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-25 08:44:16 -0700 |
| commit | 69554b2cfbbcc60d3d656dc31e74b4134caa9899 (patch) | |
| tree | 3544a186110e02c941a8c182f6e504a1f3c142cd | |
| parent | d0a432715a8d8edd1555c7159650aee3a7572f57 (diff) | |
| parent | 8e62ff05ce71ecad81d3b4bc2794f020a10647d8 (diff) | |
| download | libcore-69554b2cfbbcc60d3d656dc31e74b4134caa9899.zip libcore-69554b2cfbbcc60d3d656dc31e74b4134caa9899.tar.gz libcore-69554b2cfbbcc60d3d656dc31e74b4134caa9899.tar.bz2 | |
am ac60268a: (-s ours) am f1823804: Merge change 26285 into eclair
Merge commit 'ac60268af417d3a9a948309798d92196a958bc75'
* commit 'ac60268af417d3a9a948309798d92196a958bc75':
Use native code to convert strings to IP addresses.
0 files changed, 0 insertions, 0 deletions