Skip to content
Commit 2f322d73 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 am: f0e999b8 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87013023b6f594ddddc2fe6137afdaa5f5c313f8
parents 6650a0ad f0e999b8
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