OSDN Git Service

Merge "Fix our *ether* headers mess." am: e79b630daa am: 4d9f4086bd
authorElliott Hughes <enh@google.com>
Mon, 16 May 2016 20:10:08 +0000 (20:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 20:10:08 +0000 (20:10 +0000)
commitb82ca2c2e1c74fa5c862fa86a2d4d34ef6b39904
treeb285aba6792f995a70f17d8f7e0ef05dadc9c024
parent637294da30a544e41d6d19a164986e86d866bb7a
parentbf95aaf65a22a55899faf60254462992159bf24d
Merge "Fix our *ether* headers mess." am: e79b630daa am: 4d9f4086bd
am: bf95aaf65a

* commit 'bf95aaf65a22a55899faf60254462992159bf24d':
  Fix our *ether* headers mess.

Change-Id: Iaab3974d78f3f708b1b5d3a8736045de5e7f2602