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

Browse Source

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

...

This commit is contained in:

Xavier Ducrohet 2011-07-27 14:03:35 -07:00 committed by Android Git Automerger

parent 5bf7250ab7 e32af36b39

commit fba44526c0

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