Merge pull request #630 from buffer51/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Fri, 4 Sep 2015 18:01:01 +0000 (13:01 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Fri, 4 Sep 2015 18:01:01 +0000 (13:01 -0500)
Fixed error in common.h for Android compilation introduced by e12cf11


Trivial merge