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)
commit14ea8f8b89ee401f42277f2a2d66710002392c6d
tree456629ae525e1141751151a9347ea03edf9bcaaf
parent3f62a9176c71cff4f57e2325d282f1add4e8f537
parent5fb9cacd5cbe98b6f16a1a707c8c76e94d3249e6
Merge branch 'android_build_enhanced' into android_sound