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