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

Merge "The NDK non-neon libz.a needs cpu_features.c symbols." am: 87867d6c am: 09cb8a61 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I501d45a4de21449596e397d97d72a5c54ffb27d6
parents 79bdb15e 09cb8a61
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