Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jul 2012 08:42:07 +0000 (10:42 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jul 2012 08:42:07 +0000 (10:42 +0200)
commit16b5c6b9ad29bee58dec8aa301b21a2992d63d00
tree2b6c4ffa1f0a416a2844931e65c360144c9679c6
parent41f2cf116916d7fd8e2adbe3b513713fed02eefa
parent1e63d71c91c8c4ecf048adc719c7158630d5d063
Merge remote-tracking branch 'origin/master'
AndroidManifest.xml