tree f97126faede822b63f38922102e740910de54d1e
parent 36ff3bd273d9f60822104eb53f3aa1886160b360
parent d97a34af49f6beafc21d5f459ea62b499544f9f3
author Elliott Hughes <enh@google.com> 1384297130 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384297130 -0800

am d97a34af: am 60e7d495: Merge "Fix libnetutils to build with clean uapi headers."

* commit 'd97a34af49f6beafc21d5f459ea62b499544f9f3':
  Fix libnetutils to build with clean uapi headers.