tree c0617d423503a60dc02bbc808bf5918a494b7336
parent 7f60047cb4c1acc8d3f8b5e3f518040ddf709b06
parent de915e3ade1b067790698d2723b538eb75a76c15
author Tomasz Mikolajewski <mtomasz@google.com> 1478047487 +0000
committer android-build-merger <android-build-merger@google.com> 1478047487 +0000

Merge "Add support for opening JAR/ZIP files via FD." am: 7f64c195f7 am: 4c65d49a92
am: de915e3ade

Change-Id: I625a398a8def68b8b8ef77f1408f5c6f8a85c1fa