From: Dan Willemsen <dwillemsen@google.com>
Date: Fri, 13 May 2016 22:33:48 +0000 (+0000)
Subject: Merge "Don\'t use GTEST_OS_LINUX on Darwin"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=33b3051784;p=android-x86%2Fbuild.git

Merge "Don\'t use GTEST_OS_LINUX on Darwin"
am: 439f4dd189

* commit '439f4dd1895eef8684b3257fe5631a45d51635d6':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
---

33b30517846744adff51579f26a711732caaa338