tree f571de15b896bd6f8846ab1d1052d06bfe38fe40
parent 96190f1c054e2e34ac741de1d7afb2f6645d218c
parent df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7
author Jeff Sharkey <jsharkey@android.com> 1392743744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392743744 +0000

am df47ecaa: am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"

* commit 'df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
  Tethering: Skip link local addresses when enabling NAT