tree c27693f182af421d087bd3f7961668206d10b60a
parent 2a9b0df9e74882d2eac38664a88b00ac861930b7
parent d1624add2b73ce8ff7826ce27b1d6d6e35bb83a6
author Lorenzo Colitti <lorenzo@google.com> 1294200577 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294200577 -0800

Merge "Don't treat private IPv4 addresses as being in a non-global scope. The effect of this change is essentially to prefer NATed IPv4 over 6to4."