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