| commit | 9f06c3e6512fdca13080df53bf5a8c0e3e5b1094 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Wed Oct 21 22:44:33 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 21 22:44:33 2009 -0700 |
| tree | e09afd68ee07f69feaa69e46e5ab9a992d1f534e | |
| parent | 3d02eacbdef0c1a0c0725d10628bec13f4139be9 [diff] | |
| parent | 7d3d31d5642bcae97c44bbdacafdced1e8e1c034 [diff] |
am 7d3d31d5: (-s ours) am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair Merge commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034' * commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034': use aapt to build jar files instead of the system zip (DO NOT MERGE)