tree 925dc4c21ca668700bc6c5256c5da05d63d1503d
parent 68a63161cfbaf31a2e0cb886b0b3870d9da3ed99
parent 03944f29647fc432b22e6ec2412672cb6783a78e
author Kenny Root <kroot@google.com> 1285366958 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285366958 -0700

am 3e07c000: am 74865ef6: Merge "Add locking around ZIP seeking" into gingerbread

Merge commit '3e07c0007b10fbda945516acaf6b2a8787a6ca06'

* commit '3e07c0007b10fbda945516acaf6b2a8787a6ca06':
  Add locking around ZIP seeking