| commit | f0f35e3df0c0ed2ce67feb1cdae9c41f884118c4 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Tue Nov 08 22:58:01 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Nov 08 22:58:01 2016 +0000 |
| tree | 5a3522720500f8c0c10c3a49bb9d195f89a22cea | |
| parent | 16e9b8a9de00597fd4ceca1750efde25421ddb85 [diff] | |
| parent | 5a25fe21f0da174081160cd919ab44d8e0ce1260 [diff] |
Merge "Don't ship updated zlib headers in the NDK." am: c1c4c171a2 am: 5a25fe21f0 Change-Id: I207301dfda00d15452ca658cd753382776721594