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

* commit '0f5146490b1c9d07297753dff26780e812db3f20':
This commit is contained in:
Elliott Hughes 2015-08-27 14:30:48 +00:00 committed by Android Git Automerger
commit 2dc034d410

Diff content is not available