summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBrad Leege <brad@mapbox.com>2016-06-09 15:36:41 -0500
committerGitHub <noreply@github.com>2016-06-09 15:36:41 -0500
commitacfa2ce0fd96d6f095372c53cfcbf694d3fde5d5 (patch)
treee8839927414a7e940a9c4ccddbb52113cb2775ca /platform
parent7329a40e73cc5816d7a758282dff8a8eb3af748e (diff)
downloadqtlocation-mapboxgl-acfa2ce0fd96d6f095372c53cfcbf694d3fde5d5.tar.gz
[android] #5291 - Fixing merge error for .travis.yml
Diffstat (limited to 'platform')
0 files changed, 0 insertions, 0 deletions