tree 22e31651bf3dee34343824f9f9f412a979a9e375
parent 8a1bb5f42998d321580c6b1057ba46a41eb41fdd
parent 53f6d1b060c10121062c4054514c3e3a0c2444bd
author Erik Kline <ek@google.com> 1536929236 -0700
committer android-build-merger <android-build-merger@google.com> 1536929236 -0700

Merge "Use IPv6 hop limit from upstream interface."
am: 53f6d1b060

Change-Id: I827f0ad4c60f7fcc0b470b597ebaacfc0fc7dac7