am 7d3d31d5: (-s ours) am b04f8cdc: am decdbd79: (-s ours) Merge change I5e98e6f0 into eclair

Browse Source

Merge commit '7d3d31d5642bcae97c44bbdacafdced1e8e1c034'

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

...

This commit is contained in:

Doug Zongker 2009-10-21 22:44:33 -07:00 committed by Android Git Automerger

parent 3d02eacbde 7d3d31d564

commit 9f06c3e651

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available