OSDN Git Service

am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID...
authorBen Cheng <bccheng@google.com>
Mon, 27 Aug 2012 19:32:32 +0000 (12:32 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Aug 2012 19:32:32 +0000 (12:32 -0700)
commit50ad303126dc797c1c05844bd59ffae3c081a468
tree1df330276e8effaeabb13af9de4e170a0019cacb
parent3b31ef7a35250fbaff20b345c85d40e2214a0493
parent0419b446598f0c3cbf46ef2f2973e043338ac988
am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev

* commit '0419b446598f0c3cbf46ef2f2973e043338ac988':
  Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.