OSDN Git Service

am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair
authorDoug Zongker <dougz@android.com>
Thu, 22 Oct 2009 05:22:32 +0000 (22:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Oct 2009 05:22:32 +0000 (22:22 -0700)
commitb04f8cdccf01132c7c14df1fed1f39c9dbb752c6
tree24651def1a821ade735f2c0ec3befb6c0a5f085c
parentdaf234d374840d96282b34393309487a21ab45c4
parentdecdbd7956c34895f73001cfa2018a27c8702ad0
am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair

Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2

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