Brad Davis 3d186efbac Merge remote-tracking branch 'gcalero/android_render_pr' into android_nov		2018-01-08 14:04:52 -08:00
..
app	Resolving comments in PR	2018-01-08 17:36:08 -03:00
build.gradle	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
build_recipes.md	.	2017-12-18 10:21:22 -08:00
gradle.properties
settings.gradle
setupGVR.gradle	Enable windows builds	2017-11-28 11:32:32 -08:00