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:
3b31ef7
0419b44
)
am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID...
author
Ben Cheng
<bccheng@google.com>
Mon, 27 Aug 2012 19:32:32 +0000
(12:32 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 27 Aug 2012 19:32:32 +0000
(12:32 -0700)
* commit '
0419b446598f0c3cbf46ef2f2973e043338ac988
':
Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
Trivial merge