tree bf1af03eaccbd87bb88f292f31ecb1c6ae36cba1
parent 9a41b24c8f7768d3402256dbd876024f33b1f36b
parent fef3dd01fbad923bf7ff509f4ee95312fd7cb4db
author Jeff Sharkey <jsharkey@android.com> 1392744143 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392744143 +0000

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

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