tree c56d25f64d303523c605287fb1f7f755ff3caafc
parent ccca2a8f71dbef6d4a803118f306909c074ab489
parent 2664be0232a806b056e6654bf386f374b6d72969
author Elliott Hughes <enh@google.com> 1438271531 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1438271531 +0000

Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."