Merge branch 'develop' into review_build_process
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Oct 2013 16:30:38 +0000 (17:30 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Oct 2013 16:30:38 +0000 (17:30 +0100)
commit797d16418437966b864cefcd21ab36b358710188
tree410203e0705455b8cf7f0fb91a39ae1d42846227
parentcfa1b1744f4011536564b575756773c5bb47c130
parent7335759b850e8dbca33c100246772066b8f85f08
Merge branch 'develop' into review_build_process
AndroidManifest.xml