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:
commit
80543fa0e9