tree 4d35c4ae792e03fe6836b5b17eb8dd7745ab95a9
parent 14a94052fdca4dd0e01386d7b62668fe9c702fb7
parent 4f8e794825fff729825c237bafb7cba7c714a35d
author Elliott Hughes <enh@google.com> 1495586027 +0000
committer android-build-merger <android-build-merger@google.com> 1495586027 +0000

Merge "Define HAVE_SYS_SYSMACROS_H for Android." am: 9b9a786601 am: 656008e0d4
am: 4f8e794825

Change-Id: I789466536d74d319b31549baafae0e06c798731e