OSDN Git Service

am 0a96d548: am 0eaba68a: Add tests for {sticky,non-sticky} pktinfo routing
authorLorenzo Colitti <lorenzo@google.com>
Wed, 4 Feb 2015 18:57:34 +0000 (18:57 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Feb 2015 18:57:34 +0000 (18:57 +0000)
* commit '0a96d548315bb176cf6d1d95f585d0c3aafde3b2':
  Add tests for {sticky,non-sticky} pktinfo routing


Trivial merge