Skip to content
Commit f0e999b8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Automerger Merge Worker
Browse files

Merge "Distinguish between host and device x86." am: 4fa66caa am: a4d15b4e 

Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1541130

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e89efd5a3e41ade42c7300f2b0d0929222e6717
parents ab3deeee a4d15b4e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment