tree 4d35c4ae792e03fe6836b5b17eb8dd7745ab95a9
parent 5333fe2b4f3944bb3206329ea81a770760e39cf2
parent e58dc46380039e86b3e197e1c53ba6c1708db98f
author Elliott Hughes <enh@google.com> 1495586147 +0000
committer android-build-merger <android-build-merger@google.com> 1495586147 +0000

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

Change-Id: I08d292ece8442f05749adce9b765fe2a1853ac7e