| commit | 2f322d73fe341c869f5401f6795e90316d6fdcf9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Jan 07 22:34:38 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 07 22:34:38 2021 +0000 |
| tree | 05c19f85e69338c534b0ab9f946fcb12a4988ddd | |
| parent | 6650a0ad864ac359d0d244a5187635198a917907 [diff] | |
| parent | f0e999b8abcacb5031f338f0dd2b61181cfa40c4 [diff] |
Merge "Distinguish between host and device x86." am: 4fa66caa13 am: a4d15b4e06 am: f0e999b8ab Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/1541130 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I87013023b6f594ddddc2fe6137afdaa5f5c313f8