am 3275b80f: (-s ours) am a8235340: am 4d0bf120: (-s ours) Merge change I08c19bee into eclair

Browse Source

Merge commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05'

* commit '3275b80f0dc8e2a0bcc048ad0907762f11910f05':
  DO NOT MERGE: Another gcc 4.0.3 workaround.

...

This commit is contained in:

Andy McFadden

2009-11-01 21:54:03 -08:00

committed by Android Git Automerger

parent 16dc9b5174 3275b80f0d

commit 288aa1c22a

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