tree c260d2d40afdcab61d6be5fad0f962609d1f96b1
parent b5756c8912237f4a2f5a0ce5dcbdced623d26ecd
parent 634144cd0851b93c8db956a850b27aa7c93110c8
author Elliott Hughes <enh@google.com> 1495677335 +0000
committer android-build-merger <android-build-merger@google.com> 1495677335 +0000

Merge "Stop including <sys/sysmacros.h> from <sys/types.h>." am: f58179cda5 am: b9bf674cc8 am: 4107ee67e4
am: 634144cd08

Change-Id: I622a373fc62a44b5c2bc3885f4741351f38c21af