tree 1e193cb9d61b5483c158596dd0709d106d616259
parent a1c7b096dfadc9ba7ee2ef432569eb3180f9bf34
parent 74865ef6600e2e81cecf6619ab7141df6a7dfeb9
author Kenny Root <kroot@google.com> 1285353402 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285353402 -0700

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

Merge commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9' into gingerbread-plus-aosp

* commit '74865ef6600e2e81cecf6619ab7141df6a7dfeb9':
  Add locking around ZIP seeking