OSDN Git Service

Merge "Don\'t use GTEST_OS_LINUX on Darwin" am: 439f4dd189
authorDan Willemsen <dwillemsen@google.com>
Fri, 13 May 2016 22:36:22 +0000 (22:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 13 May 2016 22:36:22 +0000 (22:36 +0000)
commit28ffa853ee6f1e86c5c53d4f5dd7cf7bd9e7f7e0
tree8591883fec35fa67398b7fa94ec820eab523de7c
parent80a9d0e20a4f4203bde04445d20bf06e813a43f1
parent33b30517846744adff51579f26a711732caaa338
Merge "Don\'t use GTEST_OS_LINUX on Darwin" am: 439f4dd189
am: 33b3051784

* commit '33b30517846744adff51579f26a711732caaa338':
  Don't use GTEST_OS_LINUX on Darwin

Change-Id: Iff14f3c4819c2b604bf0c39b69a45110fcee1fbf