tree 117e14d5da80d8e3cd6f2afcba5b8eacee303eed
parent 2e1d4fcc089f4d3451e9c982e7b192143df37674
parent 24c68680f1c187fa9d2a9cc4c4ddb5ae09fa7dfb
author Erik Kline <ek@google.com> 1426025067 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426025067 +0000

am 24c68680: am 649f614e: am 2882e512: Merge "Add support for netlink sockets and addresses."

* commit '24c68680f1c187fa9d2a9cc4c4ddb5ae09fa7dfb':
  Add support for netlink sockets and addresses.