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

* commit '4d21c7732c978a593dfa78f8da1fed7511b38e95':
  DO NOT MERGE. may fix build on some version of gcc
This commit is contained in:
Xavier Ducrohet
2011-07-27 14:01:23 -07:00
committed by Android Git Automerger

Diff Content Not Available