tree 5e9c8c7f19d8a261cbb4623539d82145bc6cc641
parent c10a5dc4ab4e727c27326ee0fd99e9ee1f27d3a2
parent e1bc33228e27a668b8019e3e9727d30612e2a05c
author Alex Klyubin <klyubin@google.com> 1482267915 +0000
committer android-build-merger <android-build-merger@google.com> 1482267915 +0000

Merge "Permit 65535 byte ZIP comments and empty Central Directory" am: f420b91e26 am: be81b50b6e
am: e1bc33228e

Change-Id: I80c703f7784436414263fb86f56b7c85a6da40e7