tree 527019ef2d98fbdb9986060f974105434045bbfe
parent 2f5f5035b1248aa27ba650b49636be54eeb7f734
parent 097c56c09a7b9fdf5e26eec801a4c0eb6cb4cdda
author Casey Dahlin <sadmac@google.com> 1489186828 +0000
committer android-build-merger <android-build-merger@google.com> 1489186828 +0000

Merge "Don't set HAVE_LINUX on non-Linux targets" am: ffc0bca66f am: e8c5780353
am: 097c56c09a

Change-Id: I3d786c52b7d6d97a4700c12c57660bf5c9457480