OSDN Git Service

am 7d3d31d5: (-s ours) am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0...
authorDoug Zongker <dougz@android.com>
Thu, 22 Oct 2009 05:44:33 +0000 (22:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 05:44:33 +0000 (22:44 -0700)
Merge commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034'

* commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)


Trivial merge