tree b7051fbb428394e111bdb6b24390b95105e23d09
parent fd04f91dffa3d574d8df169e4a93a2c7cc908fcf
parent 2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b
author Mark Salyzyn <salyzyn@google.com> 1400718837 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400718837 +0000

am 2a7ce0bc: am 9a12e952: am 5b7bb03e: Merge "Revert "libnetutils: Turn on -Werror""

* commit '2a7ce0bc7da0201c4b228d04d900ec440bfdcf8b':
  Revert "libnetutils: Turn on -Werror"