OSDN Git Service

am 60751517: (-s ours) am d6bec833: am 80a4e249: Dalvik Zip rewrite.
authorAndy McFadden <fadden@android.com>
Thu, 6 May 2010 22:41:28 +0000 (15:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 May 2010 22:41:28 +0000 (15:41 -0700)
Merge commit '60751517acb65abf5a4f5cede844d8932dea9542' into dalvik-dev

* commit '60751517acb65abf5a4f5cede844d8932dea9542':
  Dalvik Zip rewrite.


Trivial merge