tree a796bd195665d880427d5dad7544480a90f737ff
parent 05e7e3450006438311b18d6b0be920ad5579782a
parent 139ae5477f2df8aef40f0689371b055a438a72af
author Kenny Root <kroot@google.com> 1378921324 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378921324 -0700

am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev

* commit '139ae5477f2df8aef40f0689371b055a438a72af':
  Reconcile differences between zip implementations