Trinh Pham 068bb87ab3 Merge branch 'master' of https://github.com/budtmo/docker-android ...

# Conflicts:
#	docker/Emulator_x86
#	docker/configs/sources1810.list
#	docker/configs/x11vnc.pref
#	docker/sources1810.list
#	docker/x11vnc.pref
#	src/sources1810.list
#	src/x11vnc.pref

2019-07-10 18:28:53 +07:00

..

configs

Organize config files

2019-07-10 15:59:18 +07:00

Emulator_x86

Merge branch 'master' of https://github.com/budtmo/docker-android

2019-07-10 18:28:53 +07:00

Genymotion

Updated the base image

2019-07-10 09:35:17 +02:00

Real_device

Updated the base image

2019-07-10 09:35:17 +02:00