diff --git a/android/java/app/src/main/AndroidManifest.xml b/android/java/app/src/main/AndroidManifest.xml
index a48f83caf..567529187 100644
--- a/android/java/app/src/main/AndroidManifest.xml
+++ b/android/java/app/src/main/AndroidManifest.xml
@@ -3,10 +3,6 @@
     package="com.mapbox.mapboxgl.app"
     android:versionCode="1"
     android:versionName="0.1" >
-    
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-    
-    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="false"
@@ -17,17 +13,17 @@
             android:name="com.mapbox.mapboxgl.app.MainActivity"
             android:label="@string/app_name"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize">
-        </activity>
-        <activity
-            android:name="com.mapbox.mapboxgl.app.FragmentActivity"
-            android:label="@string/app_name"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.mapbox.mapboxgl.app.FragmentActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize|smallestScreenSize">
+        </activity>
     </application>
 
 </manifest>
diff --git a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
index 798e05a84..acc899500 100644
--- a/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
+++ b/android/java/app/src/main/java/com/mapbox/mapboxgl/app/MainActivity.java
@@ -1,6 +1,10 @@
 package com.mapbox.mapboxgl.app;
 
 import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.ConnectivityManager;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.util.Log;
@@ -16,6 +20,10 @@ public class MainActivity extends Activity {
     // Tag used for logging
     private static final String TAG = "MainActivity";
 
+    //
+    // Instance members
+    //
+
     // The map
     private MapView mMapView;
 
diff --git a/android/java/lib/src/main/AndroidManifest.xml b/android/java/lib/src/main/AndroidManifest.xml
index 16dabf837..5a6cdc0f9 100644
--- a/android/java/lib/src/main/AndroidManifest.xml
+++ b/android/java/lib/src/main/AndroidManifest.xml
@@ -5,6 +5,13 @@
     
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     
-    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
+    <receiver android:name="com.mapbox.mapboxgl.lib.MapView.ConnectivityReceiver" android:exported="false">
+        <intent-filter>
+            <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+        </intent-filter>
+    </receiver>
 
 </manifest>
diff --git a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
index 9dc5d5e3f..08208657b 100644
--- a/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
+++ b/android/java/lib/src/main/java/com/mapbox/mapboxgl/lib/MapView.java
@@ -3,10 +3,16 @@ package com.mapbox.mapboxgl.lib;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.TypedArray;
 import android.graphics.PointF;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
@@ -75,6 +81,13 @@ public class MapView extends SurfaceView {
     // Used to track trackball long presses
     private TrackballLongPressTimeOut mCurrentTrackballLongPressTimeOut;
 
+    // Used to check connection status
+    private ConnectivityManager mConnectivityManager;
+    private ConnectivityReceiver mConnectivityReceiver;
+
+    // Holds the context
+    private Context mContext;
+
     //
     // Properties
     //
@@ -113,9 +126,12 @@ public class MapView extends SurfaceView {
     private void initialize(Context context, AttributeSet attrs) {
         Log.v(TAG, "initialize");
 
+        // Save the context
+        mContext = context;
+
         // Check if we are in Eclipse UI editor
         if (isInEditMode()) {
-            // TODO editor does not load properly because we dont implement this
+            // TODO editor does not load properly because we don't implement this
             return;
         }
 
@@ -134,11 +150,15 @@ public class MapView extends SurfaceView {
         mStyleUrl = "file://" + dataPath + "/styles/styles/bright-v6.json";
         mAccessToken = "pk.eyJ1IjoibGpiYWRlIiwiYSI6IlJSQ0FEZ2MifQ.7mE4aOegldh3595AG9dxpQ";
 
+        // Are we a debug build?
+        boolean isDebuggable = (context.getApplicationInfo().flags &
+                ApplicationInfo.FLAG_DEBUGGABLE) == ApplicationInfo.FLAG_DEBUGGABLE;
+
         // Create the NativeMapView
         mNativeMapView = new NativeMapView(this, cachePath, dataPath);
         mNativeMapView.setStyleURL(mStyleUrl);
         mNativeMapView.setAccessToken(mAccessToken);
-        mNativeMapView.setDebug(true);
+        mNativeMapView.setDebug(isDebuggable);
 
         // Load the attributes
         TypedArray typedArray = context.obtainStyledAttributes(attrs,
@@ -194,6 +214,14 @@ public class MapView extends SurfaceView {
                 mZoomButtonsController.setZoomSpeed(300);
                 mZoomButtonsController.setOnZoomListener(new OnZoomListener());
             }
+
+            // Check current connection status
+            mConnectivityManager = (ConnectivityManager)context.getSystemService(
+                    Context.CONNECTIVITY_SERVICE);
+            NetworkInfo activeNetwork = mConnectivityManager.getActiveNetworkInfo();
+            boolean isConnected = (activeNetwork != null) &&
+                    activeNetwork.isConnectedOrConnecting();
+            onConnectivityChanged(isConnected);
         }
     }
 
@@ -425,6 +453,11 @@ public class MapView extends SurfaceView {
     // Must be called from Activity onPause
     public void onPause() {
         Log.v(TAG, "onPause");
+
+        // Register for connectivity changes
+        getContext().unregisterReceiver(mConnectivityReceiver);
+        mConnectivityReceiver = null;
+
         mNativeMapView.pause();
     }
 
@@ -433,6 +466,12 @@ public class MapView extends SurfaceView {
 
     public void onResume() {
         Log.v(TAG, "onResume");
+
+        // Register for connectivity changes
+        mConnectivityReceiver = new ConnectivityReceiver();
+        mContext.registerReceiver(mConnectivityReceiver,
+                new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION));
+
         mNativeMapView.resume();
     }
 
@@ -472,7 +511,8 @@ public class MapView extends SurfaceView {
                 int height) {
             Log.v(TAG, "surfaceChanged");
             Log.i(TAG, "resize " + format + " " + width + " " + height);
-            mNativeMapView.resize((int) (width / mScreenDensity), (int) (height / mScreenDensity), mScreenDensity, width, height);
+            mNativeMapView.resize((int) (width / mScreenDensity), (int) (height / mScreenDensity),
+                    mScreenDensity, width, height);
         }
     }
 
@@ -1132,6 +1172,32 @@ public class MapView extends SurfaceView {
         }
     }
 
+    //
+    // Action events
+    //
+
+    // This class handles connectivity changes
+    private class ConnectivityReceiver extends BroadcastReceiver {
+
+        // Called when an action we are listening to in the manifest has been sent
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.v(TAG, "ConnectivityReceiver.onReceive: action = " + intent.getAction());
+            if (intent.getAction() == ConnectivityManager.CONNECTIVITY_ACTION) {
+                boolean noConnectivity = intent.getBooleanExtra(
+                        ConnectivityManager.EXTRA_NO_CONNECTIVITY, false);
+                onConnectivityChanged(!noConnectivity);
+            }
+        }
+    }
+
+
+    // Called when our Internet connectivity has changed
+    private void onConnectivityChanged(boolean isConnected) {
+        Log.v(TAG, "onConnectivityChanged: " + isConnected);
+        mNativeMapView.setReachability(isConnected);
+    }
+
     //
     // Accessibility events
     //