tree fdbfe60bf20d53ce6f5f81099a9d1bb0786857b4
parent 3859029a48aa78150fa61eb4988214f8632b33ce
parent 3e13ed0864944c5fcff9d519eacf1f75c7db652a
author Piotr Jastrzebski <haaawk@google.com> 1408442994 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408442994 +0000

am 3e13ed08: Merge "Cleanup ziparchive"

* commit '3e13ed0864944c5fcff9d519eacf1f75c7db652a':
  Cleanup ziparchive