OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5bd91e6
439f4dd
)
Merge "Don\'t use GTEST_OS_LINUX on Darwin"
author
Dan Willemsen
<dwillemsen@google.com>
Fri, 13 May 2016 22:33:48 +0000
(22:33 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 13 May 2016 22:33:48 +0000
(22:33 +0000)
am:
439f4dd189
* commit '
439f4dd1895eef8684b3257fe5631a45d51635d6
':
Don't use GTEST_OS_LINUX on Darwin
Change-Id: Ie05e2df72a2cbfa52d6b767cd009c36a640ef23e
Trivial merge