PeratX 471a59e2c7 Merge branch 'dnsmasq' ... # Conflicts: # app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java		2017-05-09 19:15:42 +08:00
..
src/main	Merge branch 'dnsmasq'	2017-05-09 19:15:42 +08:00
.gitignore	Initial commit	2017-04-03 22:07:32 +08:00
build.gradle	Optimized DNS Test method	2017-05-04 21:01:13 +08:00
proguard-rules.pro	Initial commit	2017-04-03 22:07:32 +08:00