tree 3b42c81ed698aeb268a51150301ec4b6b36218b2
parent 39f7c6b2969354cffcc0e5965a075c49b2d1bab6
parent 8cdef644b3fe20d27ce96a3ecdca25e3f88808b1
author Elliott Hughes <enh@google.com> 1495148612 +0000
committer android-build-merger <android-build-merger@google.com> 1495148612 +0000

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

Change-Id: I57cbaa68240c2c0127a246f7536e0dc8d9cd4f80