commit | 5a25fe21f0da174081160cd919ab44d8e0ce1260 | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Tue Nov 08 22:52:31 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Nov 08 22:52:31 2016 +0000 |
tree | 5a3522720500f8c0c10c3a49bb9d195f89a22cea | |
parent | 01705247d542bc42531007a77b8172a0014b270e [diff] | |
parent | c1c4c171a2a8ff9912650e8278219723cf9ae2ea [diff] |
Merge "Don't ship updated zlib headers in the NDK." am: c1c4c171a2 Change-Id: I541068b75c6eabf68cea8ba408b8caaf658023a3