tree 91b8b03e2417f8f2731b7cc798b649edd1191122
parent 3591063dad785616f906c1452e65272d47ef3c88
parent 4b37b22d1c41a0ef21c4ae24270bba5c53ba3966
author Dan Albert <danalbert@google.com> 1428703149 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428703149 +0000

am 1110aa78: am 65937e9b: Merge "Prevent unaligned read in libziparchive."

* commit '1110aa782620717b515f8122b4a43539763681f7':
  Prevent unaligned read in libziparchive.