Merge pull request #3273 from realjiangms/fix_android_crash_rotate_3258
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 7 Apr 2016 12:52:52 +0000 (14:52 +0200)
committerBernhard Miklautz <bmiklautz@users.noreply.github.com>
Thu, 7 Apr 2016 12:52:52 +0000 (14:52 +0200)
Fix android rotation crash


Trivial merge