Commits
Xavier Ducrohet authored and Android Git Automerger committed b3ab070edb1M
am 3a2d1c23: am ddb8e3b2: am 9bac0a9f: Merge "Fix to compile for windows" * commit '3a2d1c2351c0b4eeb4dc4d91d1c334b9f8ba00ed': Fix to compile for windows
Showing diff to3a2d1c2351c