tree 658195c4eae268b76242ffe4cade81cc5aeb4c4c
parent 939f0b03e832c898a4c3e623356a88b7c0588dd6
parent 29b41dce6db31d22efeb0d5230f12e777c1011d2
author Elliott Hughes <enh@google.com> 1495148367 +0000
committer android-build-merger <android-build-merger@google.com> 1495148367 +0000

Merge "init should #include <sys/sysmacros.h>" am: 64e3f88d69
am: 29b41dce6d

Change-Id: I75504f62d5e1a5f897c59b6a480ec726fb4494de