tree 10812e558acd7a20abcc3231853b968a16d63ec9
parent 2d139fcf2916ad6d0008cf32a2fc1c2899eda3ff
parent 5d60719e42fdc0d007920d946f1c1bb440cedab7
author Dan Albert <danalbert@google.com> 1427155947 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427155947 +0000

am 5d60719e: Merge "Run ZipFile.testzip() during zipfile tests."

* commit '5d60719e42fdc0d007920d946f1c1bb440cedab7':
  Run ZipFile.testzip() during zipfile tests.