tree 32ad79e8a6ec0858b17badc9846b8e801511e469
parent e5f45d3719275b0fd752b94c3de2e6ca8bb097bb
parent 7924895a54b8f0b67514224a7ad9d67c79b3eeaf
author Andrew Hsieh <andrewhsieh@google.com> 1356331158 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1356331158 -0800

Merge "Use __ANDROID__ to test for Android platform"