From: Elliott Hughes <enh@google.com>
Date: Tue, 9 Dec 2014 23:15:15 +0000 (+0000)
Subject: am 7381e145: Merge "Sync <net/if_types.h> with upstream."
X-Git-Tag: android-x86-7.1-r1~757^2~413
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=92fd17748376523e212dae0e606522b67d2c2883;p=android-x86%2Fbionic.git

am 7381e145: Merge "Sync <net/if_types.h> with upstream."

* commit '7381e14521fcdc4e32ca512230793ab2256726bb':
  Sync <net/if_types.h> with upstream.
---

92fd17748376523e212dae0e606522b67d2c2883