tree 79b3bc891af2df8d86e4b2742f4c6edf5416d739
parent 7c8494e6b1f82d3b04449383ee31f049e5b4bda2
parent a8aeb615080635520300b479911f6c6ad4a0d9d3
author Lorenzo Colitti <lorenzo@google.com> 1411444296 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411444296 +0000

am ce24ce4e: am 5570a0d0: am bb17a717: Merge changes I3ebf0cec,I8635472c into lmp-dev

* commit 'ce24ce4e9cfc38a2ed5a829e485decaa1763a111':
  Add a throw route to the VPN endpoint.
  Support non-unicast route types: unreachable and throw.