tree 3ab907d23c9847f41962d2a6e16c1558a9f65140
parent 414d7e859a93266c6069d33badd20b9061052806
parent cc4822682ef8493d9c9c87228edf977c1f918bd7
author Ben Cheng <bccheng@google.com> 1346095657 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346095657 -0700

Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev