am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc"

Browse Source

* commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16':
  DO NOT MERGE. may fix build on some version of gcc

...

This commit is contained in:

Xavier Ducrohet

2011-07-27 13:59:57 -07:00

committed by Android Git Automerger

parent b0878223db 4d1fa60bfe

commit 4d21c7732c

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