Commit c80b5ffb authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." 

* commit 'e2f79103':
  Use __ANDROID__ instead of HAVE_ANDROID_OS.
parents 48616867 e2f79103
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment