From: Ben Cheng <bccheng@google.com>
Date: Mon, 27 Aug 2012 19:32:32 +0000 (-0700)
Subject: am 0419b446: am 4df0782b: Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID... 
X-Git-Tag: android-x86-4.4-r1~814
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=50ad303126dc797c1c05844bd59ffae3c081a468;p=android-x86%2Fbuild.git

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.
---

50ad303126dc797c1c05844bd59ffae3c081a468