am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to...
am 4ea54f44: (-s ours) Merge "resolved conflicts for merge of b998f311 to gingerbread-plus-aosp" into gingerbread-plus-aosp
Merge commit '4ea54f44'
* commit '4ea54f44':
Add an API to request route to an IPv6 host.