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)
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-mr2

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


Trivial merge