tree 52cf15442ea87dc5bd00ef918390cbe76d25d926
parent 49d03863dc2af5223fef1cf8c84294d7980dc92f
parent 6b3a608fc9b1969a1b069b97cd966956ec3b6825
author Andreas Gampe <agampe@google.com> 1499353354 +0000
committer android-build-merger <android-build-merger@google.com> 1499353354 +0000

Merge "Bionic: Add ziparchive test dependency" am: 7b7475ce85
am: 6b3a608fc9

Change-Id: I93b68b7cf481852857b8b25163b48e6de64cdfeb