OSDN Git Service

Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."
authorElliott Hughes <enh@google.com>
Fri, 31 Jul 2015 17:54:17 +0000 (17:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 31 Jul 2015 17:54:17 +0000 (17:54 +0000)
commit9c6eab9a5bb7c979488dcfe7ea71a039e6a369fb
treecbe3d2add09ae771eaa7c5a90d18a6b3ab9c0b70
parent504462b2a2a4ed1ab4436ac5344d6550f808bb1e
parentcf27ba9a8d7d664c1362bba6637146202a3e68b3
Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."