Merge branch 'android'
authorXavi Artigas <xartigas@fluendo.com>
Mon, 1 Oct 2012 15:43:12 +0000 (17:43 +0200)
committerXavi Artigas <xartigas@fluendo.com>
Mon, 1 Oct 2012 15:43:12 +0000 (17:43 +0200)
commitf574c00ea1caa4263d5a53dc2870fe6a9cc8230d
treed0b2b69e1a9fcafbbb4f55e595b59c7901f72e43
parentbb2adae455713e91c8b4f17ff86da9041a3b5298
parent9a4b1977d443444e15444e53d6764720017ed07c
Merge branch 'android'