tree 0d5a8941600079fcf390fa726efda14dfdb4c86f
parent d2f70f60c5735a9dcea766fea95dba6f5ee021a1
parent 59727ff28ef4f1128a7fd483710ea88b52261d25
author Elliott Hughes <enh@google.com> 1495219309 +0000
committer android-build-merger <android-build-merger@google.com> 1495219309 +0000

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

Change-Id: I54c1f3020ba0c92a334966fcf52ccd92c395c329