OSDN Git Service

am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
authorDoug Zongker <dougz@android.com>
Thu, 22 Oct 2009 05:31:04 +0000 (22:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 05:31:04 +0000 (22:31 -0700)
commit7d3d31d5642bcae97c44bbdacafdced1e8e1c034
treee5b7134651c6a462664309d29536d0138e1bf7f4
parentf4b3a63c560ec157554a2f74bb40627846d39459
parentb04f8cdccf01132c7c14df1fed1f39c9dbb752c6
am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair

Merge commit 'b04f8cdccf01132c7c14df1fed1f39c9dbb752c6' into eclair-mr2-plus-aosp

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