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

* commit '64994077347276fba4fe2eb1719c7dd2c2105073':
  DO NOT MERGE. may fix build on some version of gcc
This commit is contained in:
Xavier Ducrohet 2011-07-27 14:08:27 -07:00 committed by Android Git Automerger
commit 3e81433375

Diff Content Not Available