am 145afc2c: (-s ours) am fb1ecbc5: am e6e71608: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."

Browse source

* commit '145afc2cc4f973a4ad63aeabe5b0f633c8e99cec':

...

This commit is contained in:

Elliott Hughes 2015-08-27 11:49:28 +00:00 • committed by Android Git Automerger

parent 000de11a56 145afc2cc4

commit 0f5146490b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available