From: Elliott Hughes <enh@google.com>
Date: Mon, 16 May 2016 21:31:01 +0000 (+0000)
Subject: Merge "We have the _r ether_ntoa/ether_aton functions too." am: 20fc6ecf90 am: abaf7f... 
X-Git-Tag: android-x86-8.1-r1~786
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c5e92b15af6a003d985438d90d440b09ce7d3a4d;p=android-x86%2Fbionic.git

Merge "We have the _r ether_ntoa/ether_aton functions too." am: 20fc6ecf90 am: abaf7f0bb7 am: 00bf97308c
am: 1d8496c584

* commit '1d8496c584a3f0108474b4c58843e90750bc5f1f':
  We have the _r ether_ntoa/ether_aton functions too.

Change-Id: I09bc8546ad8257215bbf5c767bc309c41f12a19e
---

c5e92b15af6a003d985438d90d440b09ce7d3a4d