| commit | 997405be1935c12008998ea7230dd93309a4aa14 | [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 | 2731b9f009e968d8eafe6eca8fa3f039483e9d92 | |
| parent | d248b0a4de69f290194970826dd795497ed9de9e [diff] | |
| parent | 6c3e7b5f0578aee0c49fa2bd4c1ba2572a9d0726 [diff] |
am 6c3e7b5f: am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" * commit '6c3e7b5f0578aee0c49fa2bd4c1ba2572a9d0726': 464xlat: use a gatewayed route, not point-to-point