From: Elliott Hughes <enh@google.com>
Date: Fri, 19 May 2017 18:45:55 +0000 (+0000)
Subject: Merge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727... 
X-Git-Tag: android-x86-9.0-r1~356^2~12
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=bfc949fe4c;p=android-x86%2Fsystem-extras.git

Merge "boot_control_copy should #include <sys/sysmacros.h>." am: 542c1b32fa am: 59727ff28e
am: cc421ba741

Change-Id: Ieec33547b5ab7e8f5ac01d72a80477516bcce7d3
---

bfc949fe4c487d0060916319c215f58de6f46e7a