commit | 6c3e7b5f0578aee0c49fa2bd4c1ba2572a9d0726 | [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 | 6cd67ff4a31c984e5d512b33c49f3f58e8f91b41 | |
parent | c2314cf5f4efa2cc767e0069dcc2a67e12d7cd20 [diff] | |
parent | 158840079a501784c76e9816b215b3a1839074ef [diff] |
am 15884007: Merge "464xlat: use a gatewayed route, not point-to-point" * commit '158840079a501784c76e9816b215b3a1839074ef': 464xlat: use a gatewayed route, not point-to-point