Commits
Xavier Ducrohet authored and Android Git Automerger committed 4d21c7732c9M
am 4d1fa60b: (-s ours) Merge "DO NOT MERGE. may fix build on some version of gcc" * commit '4d1fa60bfe660fd0fc6671116da597c0027cbb16': DO NOT MERGE. may fix build on some version of gcc
Showing diff tob0878223db8