| commit | 673eb677a27b6d761bd358edfc46ed64eedbb167 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Jul 30 09:57:18 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 30 09:57:18 2013 -0700 |
| tree | 99a89a8a2c5db39b0081086ffe9110400bd07426 | |
| parent | 10a4c0a65a28155748956915b6f58fd201b7c901 [diff] | |
| parent | 97049e5111d321b1cbce2fb784aece33794e559e [diff] |
am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" * commit '158840079a501784c76e9816b215b3a1839074ef': 464xlat: use a gatewayed route, not point-to-point