MikeAfc 3dee8788ac Merge branch 'master' into feature/render_service ...

# Conflicts:
#	gradle.properties
#	tangram/build.gradle

2019-01-28 15:08:24 +08:00

..

src/main

Keep tangram and add tangram3 for beta.

2019-01-28 14:48:19 +08:00

.gitignore

rename module name

2017-03-31 14:34:14 +08:00

build.gradle

Merge branch 'master' into feature/render_service

2019-01-28 15:08:24 +08:00

proguard-rules.pro

rename module name

2017-03-31 14:34:14 +08:00