Merge pull request #1580 from akallabeth/android_cleanup_fixes
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 12 Nov 2013 17:10:22 +0000 (09:10 -0800)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Tue, 12 Nov 2013 17:10:22 +0000 (09:10 -0800)
Android cleanup fixes


Trivial merge