OSDN Git Service

Merge "Used LinkAddress insteaad of InterfaceAddress" am: 277c7d248c am: bd681cab22
authorJack Yu <jackyu@google.com>
Sat, 13 Jan 2018 03:56:10 +0000 (03:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 13 Jan 2018 03:56:10 +0000 (03:56 +0000)
am: 25993fc579  -s ours

Change-Id: I3dfed09e54d3484096101d4eee141fcd4b91c905


Trivial merge