am e0947693: (-s ours) am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into gingerbread

* commit 'e0947693c9984727dfa775a747dd32aaaeb90284':
  DO NOT MERGE. may fix build on some version of gcc
This commit is contained in:
Xavier Ducrohet 2011-06-28 18:56:14 -07:00 committed by Android Git Automerger
commit 80543fa0e9

Diff Content Not Available