Merge "Merge "Fix ZipFilePerfTest issues by closing the file in each loop iteration." am: 90c3935195 am: 9c051367f8 am: 4c2143df58 am: 10eceff1b1 am: b90b509fc7" into tm-dev am: 12e599047c am: 8d2d35b1d9 am: 73b2e0ea88 am: a907a8c9de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18910046 Change-Id: Ic8c767d4b1d0b44b3e069cc24eb34f5de65572ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: