| commit | 1f3e3bec7f4dcd3d6bf3611b8ead17a47859e1f0 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Tue Jul 30 10:28:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 30 10:28:32 2013 -0700 |
| tree | 0b973e248aa42a9632bc6326bd85d4b9bcabf134 | |
| parent | 70dbdcc418bb50163e18a51993f37bf203db6a66 [diff] | |
| parent | 178acfced7c38c4e847e1d15f2c4b1a53d16deb7 [diff] |
am 178acfce: am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" * commit '178acfced7c38c4e847e1d15f2c4b1a53d16deb7': 464xlat: use a gatewayed route, not point-to-point