tree c5a565ac7fa10267fd343cb7b9e2112054affdb0
parent 46c74f30bb8708920907fb3565a02fca43502266
parent 9a43accb269ca3c7d28f91f6c332eeead239c496
author Adam Lesinski <adamlesinski@google.com> 1491940200 +0000
committer android-build-merger <android-build-merger@google.com> 1491940200 +0000

Merge "libziparchive: verify that gpb flags match" into oc-dev am: 91e3f638b7
am: 9a43accb26

Change-Id: I32e77816e59db0b37ac08567556fb2832ab1cf89