| commit | 7d3b1cc2cfec31110394ef5760f39d2570f327ed | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Dec 11 21:06:40 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 11 21:06:40 2013 +0000 |
| tree | 70b1078b196a90d6825aa733d9c50ac579d499c3 | |
| parent | a924e71c93511ac0ad5456ec3a1ca7dfd35f2c79 [diff] | |
| parent | 4ebf03711a8e34479f35941f2cc595e2b7283808 [diff] |
am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows." * commit '4ebf03711a8e34479f35941f2cc595e2b7283808': Whitelist libziparchive for windows.