am 2dfaa698: (-s ours) Merge change I882d2eb8 into eclair

Browse Source

Merge commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80' into eclair-mr2

* commit '2dfaa698012b36d83e342b5ef1e88734dfbcac80':
  do not merge

...

This commit is contained in:

Mike Reed

2009-10-29 01:20:26 -07:00

committed by Android Git Automerger

parent 40946aa201 2dfaa69801

commit a01dc0fc59

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

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

Diff Content Not Available