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