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

am c80b5ffb: (-s ours) am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS." 

* commit 'c80b5ffb':
parents 4bf6602d c80b5ffb
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