| commit | 46403bf739507e1dead15bc87147a62512ba6a2c | [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 | 8f8098989ff875685d952065dbf5aa126b3d791b | |
| parent | ded8148cb4ad33624af18dc3e34b86b782580aaf [diff] | |
| parent | 7ac5d3748dab69dd25651d2f5f4539b40cfbd5ae [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.