Prueba Pull Request GitHub
Merge branch 'master' of https://github.com/sicomEAFIT/GoogleMapsv2Example

Conflicts:
	EjemploGoogleMaps/src/com/example/ejemplogooglemaps/MainActivity.java
Asigna el control de Zoom si la pantalla no es multitouch
Merge branch 'master' of https://github.com/sicomEAFIT/GoogleMapsv2Example

Conflicts:
	EjemploGoogleMaps/src/com/example/ejemplogooglemaps/MainActivity.java
Merge branch 'master' of https://github.com/alejocram/GoogleMapsv2Example
Merge pull request #9 from alejocram/master

Asigna el control de Zoom si la pantalla no es multitouch