Merge branch 'master' into develop
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 4 Dec 2013 11:09:22 +0000 (12:09 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 4 Dec 2013 11:09:22 +0000 (12:09 +0100)
1  2 
AndroidManifest.xml

Simple merge