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