OSDN Git Service

am 7381e145: Merge "Sync <net/if_types.h> with upstream."
authorElliott Hughes <enh@google.com>
Tue, 9 Dec 2014 23:15:15 +0000 (23:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Dec 2014 23:15:15 +0000 (23:15 +0000)
* commit '7381e14521fcdc4e32ca512230793ab2256726bb':
  Sync <net/if_types.h> with upstream.


Trivial merge