Merge branch 'wiki' into edge

6a205782 · Chris Scott · 52fdbad8 · 13295d56 · 6a205782 · 6a205782
Commit 6a205782 authored May 11, 2015 by Chris Scott
5 changed files
--- a/example/images/android-sample-app.png
+++ b/example/images/android-sample-app.png
--- a/example/images/android-sdk-manager.png
+++ b/example/images/android-sdk-manager.png
--- a/example/images/distance-filter-city.png
+++ b/example/images/distance-filter-city.png
--- a/example/images/distance-filter-highway.png
+++ b/example/images/distance-filter-highway.png
--- a/example/images/enable-background-audio.png
+++ b/example/images/enable-background-audio.png