tree 2ca8b0a0026d28d8fcf1de7456ef33f0370877d2
parent f36a2311ab7232e0b91dc009a3a2d1d9c8130c37
parent 8fd1f27ed866169684f44f24aeaa5c4722427d18
author Piotr Jastrzebski <haaawk@google.com> 1408463663 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408463663 +0000

am 8fd1f27e: Merge "Reject zip archives with entry names containing \0."

* commit '8fd1f27ed866169684f44f24aeaa5c4722427d18':
  Reject zip archives with entry names containing \0.