| commit | 9af3c19cc1eb87af57c619bdb583df04697641ec | [log] [tgz] |
|---|---|---|
| author | Dmitriy Ivanov <dimitry@google.com> | Fri May 08 22:16:27 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 08 22:16:27 2015 +0000 |
| tree | 345c0b732a9f8c67753fe904ecc08d300be44a88 | |
| parent | a15adad27b1a33de2f4c788809ba97cff726cf58 [diff] | |
| parent | e2f7e6dd3cb6e2e5ad9ee443e05a03c84ba2d818 [diff] |
Merge branch 'mnc-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/external/zlib into mnc-dev-plus-aosp