tree b2a36b79944e94fceeea22f34a1ea184061a6ee8
parent 005d3c197bc0fbed474562c789aa6892ec2473cc
parent 6a806e76d44af58df14f9d3ac8dc4dfc4bf60893
author Colin Cross <ccross@android.com> 1541523305 -0800
committer android-build-merger <android-build-merger@google.com> 1541523305 -0800

Merge "Only zip2zip bundle resources if they exist"
am: 6a806e76d4

Change-Id: Ia17e054058ae7eadccf13a22d9a4babe41a21a1f