| commit | 10e82353220a477e014d24541c94338bf89922a9 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Dec 11 21:10:02 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 11 21:10:02 2013 +0000 |
| tree | 61a5c89382bbd9e4388eecf102731b66a3561f3a | |
| parent | 3dd963e596e2ad84f5ea38cc248d172f800ebfd3 [diff] | |
| parent | 7d3b1cc2cfec31110394ef5760f39d2570f327ed [diff] |
am 7d3b1cc2: am 4ebf0371: am 1e18a584: Merge "Whitelist libziparchive for windows." * commit '7d3b1cc2cfec31110394ef5760f39d2570f327ed': Whitelist libziparchive for windows.