Commit Graph

6 Commits

Author SHA1 Message Date
Fabian Guerra
b630dbc357 [android] Reverted master changes that doesn't apply to boba. 2018-02-16 12:42:01 -05:00
Fabian Guerra
903e7989ec Merge branch 'master' into release-boba
# Conflicts:
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/CompassView.java
#	platform/android/scripts/exclude-activity-gen.json
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/macos/CHANGELOG.md
2018-02-15 11:54:51 -05:00
Tobrun
143c346d9d [android] - translucent surface on TextureView 2018-02-13 12:53:18 +01:00
Tobrun
afdb291653 [android] - blacklist flaky instrumentation tests 2018-02-05 12:19:41 +01:00
Tobrun
9fbf5f4e74 [android] - blacklist flaky instrumentation tests 2018-02-05 10:51:04 +01:00
Tobrun
cc67335499 [android] - add config file for excluding generated tests, refactor generation script output 2017-11-08 09:58:31 +01:00