Merge remote-tracking branch 'mapbox/master' into 2317-espresso

Conflicts: src/mbgl/util/geojsonvt
2015-09-15 17:58:36 -04:00
parent 187cc36eb5
commit 7e30025abb
26 changed files with 238 additions and 42 deletions
--- a/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
+++ b/android/java/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
@@ -17,6 +17,7 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
+        <activity android:name=".SecondMapActivity" android:label="@string/activity_second"/>
        <meta-data
            android:name="io.fabric.ApiKey"
            android:value="9724157045ff7d083492c6d9ae03e60e8609d461" />