OSDN Git Service

Merge "Fix our *ether* headers mess." am: e79b630daa am: 4d9f4086bd am: bf95aaf65a
authorElliott Hughes <enh@google.com>
Mon, 16 May 2016 20:12:44 +0000 (20:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 16 May 2016 20:12:44 +0000 (20:12 +0000)
commitf5dc621e5687e8fbffbcedb37c06efa803640cef
treeb285aba6792f995a70f17d8f7e0ef05dadc9c024
parent17d5f1e8b4bec710839f54c58acdd6f902fd17b8
parentb82ca2c2e1c74fa5c862fa86a2d4d34ef6b39904
Merge "Fix our *ether* headers mess." am: e79b630daa am: 4d9f4086bd am: bf95aaf65a
am: b82ca2c2e1

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

Change-Id: Ied06aba5a41cbfa39d9dce31e52bc70921a60ce6