| commit | 0b3977f87b10fd78cffa0c39aaf787bfe6d108c7 | [log] [tgz] |
|---|---|---|
| author | Doug Zongker <dougz@android.com> | Wed Oct 21 22:22:27 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 21 22:22:27 2009 -0700 |
| tree | 8b3c8f3f7f0dde7a374c2e659b975d5ff6581968 | |
| parent | 1e23a4019a2782054fc2c72f243008e29e13b411 [diff] | |
| parent | 617262d8f57362536ddc00a070c1c0994741de44 [diff] |
am 617262d8: (-s ours) Merge change I37c4157d into eclair Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2 * commit '617262d8f57362536ddc00a070c1c0994741de44': add "junk path" -k option to aapt (DO NOT MERGE)