commit | 28ffa853ee6f1e86c5c53d4f5dd7cf7bd9e7f7e0 | [log] [tgz] |
---|---|---|
author | Dan Willemsen <dwillemsen@google.com> | Fri May 13 22:36:22 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri May 13 22:36:22 2016 +0000 |
tree | 8591883fec35fa67398b7fa94ec820eab523de7c | |
parent | 80a9d0e20a4f4203bde04445d20bf06e813a43f1 [diff] | |
parent | 33b30517846744adff51579f26a711732caaa338 [diff] |
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