| commit | dd3b909c7a4fa52a7ee64a65f3be6c8f6c048a2f | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Thu Aug 26 13:14:17 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 26 13:14:17 2010 -0700 |
| tree | 6ca310606cc8eca244bad34907fd7759836cb772 | |
| parent | b24337953cf6c1926764cd74e094ea974f8b3a4e [diff] | |
| parent | 39729d08a2141819dfcbaa52d2ef79b117cb14fe [diff] |
am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp Merge commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b' * commit '4ea54f442e6e5c0932bc0a1da8c932bb1c9ccb0b': Add an API to request route to an IPv6 host.