Merge pull request #2089 from chrox/fix_android_build

fix Android build
This commit is contained in:
Qingping Hou
2016-06-19 10:50:51 -07:00
committed by GitHub

2
base

Submodule base updated: 6fa062f20c...3d83411042