Merge branch 'android_build_enhanced' into android_sound
authorArmin Novak <anovak@thinstuff.com>
Thu, 19 Sep 2013 10:01:33 +0000 (12:01 +0200)
committerArmin Novak <anovak@thinstuff.com>
Thu, 19 Sep 2013 10:01:33 +0000 (12:01 +0200)

Trivial merge