diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2816b58
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+.gradle
+/local.properties
+/.idea
+*.iml
+.DS_Store
+/build
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..6467668
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,8 @@
+Change Log
+==========
+
+## Version 1.0.0
+
+_2015-03-25_
+
+ * Initial release.
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..57f3d49
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,44 @@
+# Contributing to Network Connection Class
+We want to make contributing to this project as easy and transparent as
+possible.
+
+## Our Development Process
+We work directly in the github project and provide versioned releases
+appropriate for major milestones and minor bug fixes or improvements.  GitHub
+is used directly for issues and pull requests and the developers actively
+respond to requests.
+
+## Pull Requests
+We actively welcome your pull requests.
+1. Fork the repo and create your branch from `master`. 
+2. If you've added code that should be tested, add tests
+3. If you've changed APIs, update the documentation. 
+4. Ensure the test suite passes. 
+5. Make sure your code lints. 
+6. If you haven't already, complete the Contributor License Agreement ("CLA").
+
+## Contributor License Agreement ("CLA")
+In order to accept your pull request, we need you to submit a CLA. You only need
+to do this once to work on any of Facebook's open source projects.
+
+Complete your CLA here: <https://code.facebook.com/cla>
+
+## Issues  
+We use GitHub issues to track public bugs. Please ensure your description is
+clear and has sufficient instructions to be able to reproduce the issue.
+
+Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
+disclosure of security bugs. In those cases, please go through the process
+outlined on that page and do not file a public issue.
+
+## Coding Style  
+* 2 spaces for indentation rather than tabs
+* Line wrapping indents 4 spaces
+* 100 character line length
+* One parameter per line when line wrapping is required
+* Use the `m` member variable prefix for private fields
+* Opening braces to appear on the same line as code
+
+## License
+By contributing to Network Connection Class, you agree that your contributions will be licensed
+under its BSD license.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..6bd6bca
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,30 @@
+BSD License
+
+For Network Connection Class software
+
+Copyright (c) 2015, Facebook, Inc. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+ * Neither the name Facebook nor the names of its contributors may be used to
+   endorse or promote products derived from this software without specific
+   prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/PATENTS b/PATENTS
new file mode 100644
index 0000000..030c5f8
--- /dev/null
+++ b/PATENTS
@@ -0,0 +1,24 @@
+Additional Grant of Patent Rights
+
+"Software" means the Network Connection Class software distributed by Facebook,
+Inc.
+
+Facebook hereby grants you a perpetual, worldwide, royalty-free, non-exclusive,
+irrevocable (subject to the termination provision below) license under any
+rights in any patent claims owned by Facebook, to make, have made, use, sell,
+offer to sell, import, and otherwise transfer the Software. For avoidance of
+doubt, no license is granted under Facebook’s rights in any patent claims that
+are infringed by (i) modifications to the Software made by you or a third party,
+or (ii) the Software in combination with any software or other technology
+provided by you or a third party.
+
+The license granted hereunder will terminate, automatically and without notice,
+for anyone that makes any claim (including by filing any lawsuit, assertion or
+other action) alleging (a) direct, indirect, or contributory infringement or
+inducement to infringe any patent: (i) by Facebook or any of its subsidiaries or
+affiliates, whether or not such claim is related to the Software, (ii) by any
+party if such claim arises in whole or in part from any software, product or
+service of Facebook or any of its subsidiaries or affiliates, whether or not
+such claim is related to the Software, or (iii) by any party relating to the
+Software; or (b) that any right in any patent claim of Facebook is invalid or
+unenforceable.
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..36b85f9
--- /dev/null
+++ b/README.md
@@ -0,0 +1,76 @@
+# Network Connection Class
+
+Network Connection Class is an Android library that allows you to figure out 
+the quality of the current user's internet connection.  The connection gets 
+classified into several "Connection Classes" that make it easy to develop 
+against.  The library does this by listening to the existing internet traffic 
+done by your app and notifying you when the user's connection quality changes.  
+Developers can then use this Connection Class information and adjust the application's 
+behaviour (request lower quality images or video, throttle type-ahead, etc).
+
+## Integration
+
+### Download
+Download [the latest JARs](https://github.com/facebook/network-connection-class/releases/latest) or grab via Gradle:
+```groovy
+compile 'com.facebook.network.connectionclass:connectionclass:1.0.0'
+```
+or Maven:
+```xml
+<dependency>
+  <groupId>com.facebook.network.connectionclass</groupId>
+  <artifactId>connectionclass</artifactId>
+  <version>1.0.0</version>
+</dependency>
+```
+
+### Calculate Connection Class
+Connection Class provides an interface for classes to add themselves as
+listeners for when the network's connection quality changes. In the subscriber
+class, implement `ConnectionClassStateChangeListener`:
+
+```java
+public interface ConnectionClassStateChangeListener {
+  public void onBandwidthStateChange(ConnectionQuality bandwidthState);
+}
+```
+
+and subscribe with the listener:
+
+```java
+ConnectionClassManager.getInstance().register(mListener);
+```
+
+Alternatively, you can manually query for the connection quality bucket with
+`getCurrentBandwidthQuality()`.
+
+```java
+ConnectionQuality cq = ConnectionClassManager.getInstance().getCurrentBandwidthQuality();
+```
+
+The main way to provide the ConnectionClassManager data is to use the DownloadBandwidthSampler.
+The DownloadBandwidthSampler samples the device's underlying network stats when you tell it
+you're performing some sort of network activity (downloading photos, playing a video, etc).  
+
+```java
+// Override ConnectionClassStateChangeListener
+ConnectionClassManager.getInstance().register(mListener);
+DownloadBandwidthSampler.getInstance().startSampling();
+// Do some downloading tasks
+DownloadBandwidthSampler.getInstance().stopSampling();
+```
+
+If the application is aware of the bandwidth downloaded in a certain time frame,
+data can be added to the moving average using:
+
+```java
+ConnectionClassManager.addBandwidth(bandwidth, time);
+```
+
+See the `connectionclass-sample` project for more details.
+
+## Improve Connection Class!
+See the CONTRIBUTING.md file for how to help out.
+
+## License
+Connection Class is BSD-licensed. We also provide an additional patent grant.
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..1d37845
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,14 @@
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.0.0'
+        classpath 'com.github.jcandksolutions.gradle:android-unit-test:2.1.1'
+    }
+}
+allprojects {
+    repositories {
+        jcenter()
+    }
+}
diff --git a/connectionclass-sample/.gitignore b/connectionclass-sample/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/connectionclass-sample/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/connectionclass-sample/build.gradle b/connectionclass-sample/build.gradle
new file mode 100644
index 0000000..d274c23
--- /dev/null
+++ b/connectionclass-sample/build.gradle
@@ -0,0 +1,22 @@
+apply plugin: 'com.android.application'
+
+repositories {
+    jcenter()
+}
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "com.facebook.network.connectionclass.sample"
+        minSdkVersion 9
+        targetSdkVersion 21
+        versionCode 1
+        versionName "1.0"
+    }
+}
+
+dependencies {
+    compile project (":connectionclass")
+}
diff --git a/connectionclass-sample/src/main/AndroidManifest.xml b/connectionclass-sample/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..21648b7
--- /dev/null
+++ b/connectionclass-sample/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.facebook.network.connectionclass.sample" >
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java b/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java
new file mode 100644
index 0000000..caa09f5
--- /dev/null
+++ b/connectionclass-sample/src/main/java/com/facebook/network/connectionclass/sample/MainActivity.java
@@ -0,0 +1,137 @@
+/*
+ *  This file provided by Facebook is for non-commercial testing and evaluation
+ *  purposes only.  Facebook reserves all rights not expressly granted.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass.sample;
+
+import android.app.Activity;
+import android.os.AsyncTask;
+import android.os.Bundle;
+
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+import com.facebook.network.connectionclass.*;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+
+public class MainActivity extends Activity {
+
+  private static final String TAG = "ConnectionClass-Sample";
+
+  private ConnectionClassManager mConnectionClassManager;
+  private DeviceBandwidthSampler mDeviceBandwidthSampler;
+  private ConnectionChangedListener mListener;
+  private TextView mTextView;
+  private View mRunningBar;
+
+  private String mURL = "http://connectionclass.parseapp.com/m100_hubble_4060.jpg";
+  private int mTries = 0;
+  private ConnectionQuality mConnectionClass = ConnectionQuality.UNKNOWN;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.activity_main);
+    mConnectionClassManager = ConnectionClassManager.getInstance();
+    mDeviceBandwidthSampler = DeviceBandwidthSampler.getInstance();
+    findViewById(R.id.test_btn).setOnClickListener(testButtonClicked);
+    mTextView = (TextView)findViewById(R.id.connection_class);
+    mTextView.setText(mConnectionClassManager.getCurrentBandwidthQuality().toString());
+    mRunningBar = findViewById(R.id.runningBar);
+    mRunningBar.setVisibility(View.GONE);
+    mListener = new ConnectionChangedListener();
+  }
+
+  @Override
+  protected void onPause() {
+    super.onPause();
+    mConnectionClassManager.remove(mListener);
+  }
+
+  @Override
+  protected void onResume() {
+    super.onResume();
+    mConnectionClassManager.register(mListener);
+  }
+
+  /**
+   * Listener to update the UI upon connectionclass change.
+   */
+  private class ConnectionChangedListener
+      implements ConnectionClassManager.ConnectionClassStateChangeListener {
+
+    @Override
+    public void onBandwidthStateChange(ConnectionQuality bandwidthState) {
+      mConnectionClass = bandwidthState;
+      runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          mTextView.setText(mConnectionClass.toString());
+        }
+      });
+    }
+  }
+
+  private final View.OnClickListener testButtonClicked = new View.OnClickListener() {
+    @Override
+    public void onClick(View v) {
+        new DownloadImage().execute(mURL);
+    }
+  };
+
+  /**
+   * AsyncTask for handling downloading and making calls to the timer.
+   */
+  private class DownloadImage extends AsyncTask<String, Void, Void> {
+
+    @Override
+    protected void onPreExecute() {
+      mDeviceBandwidthSampler.startSampling();
+      mRunningBar.setVisibility(View.VISIBLE);
+    }
+
+    @Override
+    protected Void doInBackground(String... url) {
+      String imageURL = url[0];
+      try {
+        // Open a stream to download the image from our URL.
+        InputStream input = new URL(imageURL).openStream();
+        try {
+          byte[] buffer = new byte[1024];
+
+          // Do some busy waiting while the stream is open.
+          while (input.read(buffer) != -1) {
+          }
+        } finally {
+          input.close();
+        }
+      } catch (IOException e) {
+        Log.e(TAG, "Error while downloading image.");
+      }
+      return null;
+    }
+
+    @Override
+    protected void onPostExecute(Void v) {
+      mDeviceBandwidthSampler.stopSampling();
+      // Retry for up to 10 times until we find a ConnectionClass.
+      if (mConnectionClass == ConnectionQuality.UNKNOWN && mTries < 10) {
+        mTries++;
+        new DownloadImage().execute(mURL);
+      }
+      if (!mDeviceBandwidthSampler.isSampling()) {
+        mRunningBar.setVisibility(View.GONE);
+      }
+    }
+  }
+}
diff --git a/connectionclass-sample/src/main/res/drawable-hdpi/ic_launcher.png b/connectionclass-sample/src/main/res/drawable-hdpi/ic_launcher.png
new file mode 100755
index 0000000..eba8496
Binary files /dev/null and b/connectionclass-sample/src/main/res/drawable-hdpi/ic_launcher.png differ
diff --git a/connectionclass-sample/src/main/res/drawable-mdpi/ic_launcher.png b/connectionclass-sample/src/main/res/drawable-mdpi/ic_launcher.png
new file mode 100755
index 0000000..3f0c6ff
Binary files /dev/null and b/connectionclass-sample/src/main/res/drawable-mdpi/ic_launcher.png differ
diff --git a/connectionclass-sample/src/main/res/drawable-xhdpi/ic_launcher.png b/connectionclass-sample/src/main/res/drawable-xhdpi/ic_launcher.png
new file mode 100755
index 0000000..c49fc7b
Binary files /dev/null and b/connectionclass-sample/src/main/res/drawable-xhdpi/ic_launcher.png differ
diff --git a/connectionclass-sample/src/main/res/drawable-xxhdpi/ic_launcher.png b/connectionclass-sample/src/main/res/drawable-xxhdpi/ic_launcher.png
new file mode 100755
index 0000000..3fb1b64
Binary files /dev/null and b/connectionclass-sample/src/main/res/drawable-xxhdpi/ic_launcher.png differ
diff --git a/connectionclass-sample/src/main/res/layout/activity_main.xml b/connectionclass-sample/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..d94f91f
--- /dev/null
+++ b/connectionclass-sample/src/main/res/layout/activity_main.xml
@@ -0,0 +1,36 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:gravity="center_horizontal"
+              android:padding="15dp">
+
+    <Button android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:id="@+id/test_btn"
+            android:text="@string/test_connection"
+            android:layout_marginBottom="10dp"/>
+
+    <TextView
+            android:text="@string/connection_class"
+            android:textSize="20dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"/>
+
+    <TextView
+            android:id="@+id/connection_class"
+            android:textSize="32dp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"/>
+
+    <ProgressBar
+            android:id="@+id/runningBar"
+            style="?android:attr/progressBarStyleLarge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="15dp"
+            android:visibility="gone"/>
+
+</LinearLayout>
diff --git a/connectionclass-sample/src/main/res/values/strings.xml b/connectionclass-sample/src/main/res/values/strings.xml
new file mode 100644
index 0000000..5dee7a4
--- /dev/null
+++ b/connectionclass-sample/src/main/res/values/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="app_name">ConnectionClass Sample</string>
+    <string name="test_connection">Test Connection</string>
+    <string name="connection_class">Your connection class is:</string>
+
+</resources>
diff --git a/connectionclass/.gitignore b/connectionclass/.gitignore
new file mode 100644
index 0000000..796b96d
--- /dev/null
+++ b/connectionclass/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/connectionclass/build.gradle b/connectionclass/build.gradle
new file mode 100644
index 0000000..c11b5fa
--- /dev/null
+++ b/connectionclass/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 9
+        targetSdkVersion 21
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}
+
+apply plugin: 'android-unit-test'
+
+dependencies {
+    compile 'com.google.code.findbugs:jsr305:2.0.1'
+
+    testCompile 'junit:junit:4.12'
+    testCompile('org.robolectric:robolectric:2.4') {
+        exclude module: 'commons-logging'
+        exclude module: 'httpclient'
+    }
+    testCompile 'org.powermock:powermock-api-mockito:1.6.1'
+    testCompile 'org.powermock:powermock-module-junit4:1.6.1'
+}
+
+apply from: rootProject.file('release.gradle')
\ No newline at end of file
diff --git a/connectionclass/gradle.properties b/connectionclass/gradle.properties
new file mode 100644
index 0000000..9c294a4
--- /dev/null
+++ b/connectionclass/gradle.properties
@@ -0,0 +1,3 @@
+POM_NAME=Network Connection Class
+POM_ARTIFACT_ID=connectionclass
+POM_PACKAGING=aar
\ No newline at end of file
diff --git a/connectionclass/src/main/AndroidManifest.xml b/connectionclass/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..e30dc59
--- /dev/null
+++ b/connectionclass/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.facebook.network.connectionclass">
+    <application />
+</manifest>
\ No newline at end of file
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/ByteArrayScanner.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/ByteArrayScanner.java
new file mode 100644
index 0000000..1109d9e
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/ByteArrayScanner.java
@@ -0,0 +1,159 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+import javax.annotation.Nullable;
+import java.util.NoSuchElementException;
+
+class ByteArrayScanner {
+  private @Nullable byte[] mData;
+  private int mCurrentOffset;
+  private int mTotalLength;
+  private char mDelimiter;
+  private boolean mDelimiterSet;
+
+  public ByteArrayScanner reset(byte[] buffer, int length) {
+    mData = buffer;
+    mCurrentOffset = 0;
+    mTotalLength = length;
+    mDelimiterSet = false;
+    return this;
+  }
+
+  public ByteArrayScanner useDelimiter(char delimiter) {
+    throwIfNotReset();
+    mDelimiter = delimiter;
+    mDelimiterSet = true;
+    return this;
+  }
+
+  private void throwIfNotReset() {
+    if (mData == null) {
+      throw new IllegalStateException("Must call reset first");
+    }
+  }
+
+  private void throwIfDelimiterNotSet() {
+    if (!mDelimiterSet) {
+      throw new IllegalStateException("Must call useDelimiter first");
+    }
+  }
+
+  /**
+   * @return The next token, parsed as a string.
+   * @throws NoSuchElementException
+   */
+  public String nextString()
+      throws NoSuchElementException {
+    throwIfNotReset();
+    throwIfDelimiterNotSet();
+    int offset = mCurrentOffset;
+    int length = advance();
+    return new String(mData, offset, length);
+  }
+
+  /**
+   * Matches the next token with a string.
+   * @param str String to match the next token with.
+   * @return True if the next token matches, false otherwise.
+   * @throws NoSuchElementException
+   */
+  public boolean nextStringEquals(String str)
+      throws NoSuchElementException {
+    int offset = mCurrentOffset;
+    int length = advance();
+    if (str.length() != length) {
+      return false;
+    }
+    for (int i = 0; i < str.length(); i++) {
+      if (str.charAt(i) != mData[offset]) {
+        return false;
+      }
+      offset++;
+    }
+    return true;
+  }
+
+  /**
+   * @return The next token, parsed as an integer.
+   * @throws NoSuchElementException
+   */
+  public int nextInt()
+      throws NoSuchElementException{
+    throwIfNotReset();
+    throwIfDelimiterNotSet();
+    int offset = mCurrentOffset;
+    int length = advance();
+    int value = parseInt(
+        mData,
+        offset,
+        offset + length);
+    return value;
+  }
+
+  /**
+   * Move to the next token.
+   * @throws NoSuchElementException
+   */
+  public void skip()
+      throws NoSuchElementException {
+    throwIfNotReset();
+    throwIfDelimiterNotSet();
+    advance();
+  }
+
+  private int advance()
+      throws NoSuchElementException {
+    throwIfNotReset();
+    throwIfDelimiterNotSet();
+    if (mTotalLength <= mCurrentOffset) {
+      throw new NoSuchElementException("Reading past end of input stream at " + mCurrentOffset + ".");
+    }
+    int index = indexOf(
+        mData,
+        mCurrentOffset,
+        mTotalLength,
+        mDelimiter);
+    if (index == -1) {
+      int length = mTotalLength - mCurrentOffset;
+      mCurrentOffset = mTotalLength;
+      return length;
+    } else {
+      int length = index - mCurrentOffset;
+      mCurrentOffset = index + 1;
+      return length;
+    }
+  }
+
+  private static int parseInt(byte[] buffer, int start, int end)
+      throws NumberFormatException {
+    int radix = 10;
+    int result = 0;
+    while (start < end) {
+      int digit = buffer[start++] - '0';
+      if (digit < 0 || digit > 9) {
+        throw new NumberFormatException("Invalid int in buffer at " + (start - 1) + ".");
+      }
+      int next = result * radix + digit;
+      result = next;
+    }
+    return result;
+  }
+
+  private static int indexOf(byte[] data, int start, int end, char ch) {
+    for (int i = start; i < end; i++) {
+      if (data[i] == ch) {
+        return i;
+      }
+    }
+    return -1;
+  }
+}
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java
new file mode 100644
index 0000000..fc87c1a
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionClassManager.java
@@ -0,0 +1,210 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * <p>
+ * Class used to calculate the approximate bandwidth of a user's connection.
+ * </p>
+ * <p>
+ * This class notifies all subscribed {@link ConnectionClassStateChangeListener} with the new
+ * ConnectionClass when the network's ConnectionClass changes.
+ * </p>
+ */
+public class ConnectionClassManager {
+
+  static final double DEFAULT_SAMPLES_TO_QUALITY_CHANGE = 5;
+  private static final int BYTES_TO_BITS = 8;
+
+  /**
+   * Default values for determining quality of data connection.
+   * Bandwidth numbers are in Kilobits per second (kbps).
+   */
+  private static final int DEFAULT_POOR_BANDWIDTH = 150;
+  private static final int DEFAULT_MODERATE_BANDWIDTH = 550;
+  private static final int DEFAULT_GOOD_BANDWIDTH = 2000;
+
+  /**
+   * The factor used to calculate the current bandwidth
+   * depending upon the previous calculated value for bandwidth.
+   *
+   * The smaller this value is, the less responsive to new samples the moving average becomes.
+   */
+  private static final double DEFAULT_DECAY_CONSTANT = 0.05;
+
+  /** Current bandwidth of the user's connection depending upon the response. */
+  private ExponentialGeometricAverage mDownloadBandwidth
+      = new ExponentialGeometricAverage(DEFAULT_DECAY_CONSTANT);
+  private volatile boolean mInitiateStateChange = false;
+  private AtomicReference<ConnectionQuality> mCurrentBandwidthConnectionQuality =
+      new AtomicReference<ConnectionQuality>(ConnectionQuality.UNKNOWN);
+  private AtomicReference<ConnectionQuality> mNextBandwidthConnectionQuality;
+  private ArrayList<ConnectionClassStateChangeListener> mListenerList =
+      new ArrayList<ConnectionClassStateChangeListener>();
+  private int mSampleCounter;
+
+  /**
+   * The lower bound for measured bandwidth in bits/ms. Readings
+   * lower than this are treated as effectively zero (therefore ignored).
+   */
+  static final long BANDWIDTH_LOWER_BOUND = 10;
+
+  // Singleton.
+  @Nullable
+  private static ConnectionClassManager sInstance;
+
+  /**
+   * Retrieval method for the DownloadBandwidthManager singleton.
+   * @return The singleton instance of DownloadBandwidthManager.
+   */
+  @Nonnull
+  public static ConnectionClassManager getInstance() {
+    if (sInstance == null) {
+      sInstance = new ConnectionClassManager();
+    }
+    return sInstance;
+  }
+
+  // Force constructor to be private.
+  private ConnectionClassManager() {}
+
+  /**
+   * Adds bandwidth to the current filtered latency counter. Sends a broadcast to all
+   * {@link ConnectionClassStateChangeListener} if the counter moves from one bucket
+   * to another (i.e. poor bandwidth -> moderate bandwidth).
+   */
+  public synchronized void addBandwidth(long bytes, long timeInMs) {
+
+    //Ignore garbage values.
+    if (timeInMs == 0 || (bytes) * 1.0 / (timeInMs) * BYTES_TO_BITS < BANDWIDTH_LOWER_BOUND) {
+      return;
+    }
+
+    double bandwidth = (bytes) * 1.0 / (timeInMs) * BYTES_TO_BITS;
+    mDownloadBandwidth.addMeasurement(bandwidth);
+
+    if (mInitiateStateChange) {
+      mSampleCounter += 1;
+      if (getCurrentBandwidthQuality() != mNextBandwidthConnectionQuality.get()) {
+        mInitiateStateChange = false;
+        mSampleCounter = 1;
+      }
+      if (mSampleCounter >= DEFAULT_SAMPLES_TO_QUALITY_CHANGE) {
+        mInitiateStateChange = false;
+        mSampleCounter = 1;
+        mCurrentBandwidthConnectionQuality.set(mNextBandwidthConnectionQuality.get());
+        notifyListeners();
+      }
+      return;
+    }
+
+    if (mCurrentBandwidthConnectionQuality.get() != getCurrentBandwidthQuality()) {
+      mInitiateStateChange = true;
+      mNextBandwidthConnectionQuality =
+          new AtomicReference<ConnectionQuality>(getCurrentBandwidthQuality());
+    }
+  }
+
+  /**
+   * Resets the bandwidth average for this instance of the bandwidth manager.
+   */
+  public void reset() {
+    if (mDownloadBandwidth != null) {
+      mDownloadBandwidth.reset();
+    }
+    mCurrentBandwidthConnectionQuality.set(ConnectionQuality.UNKNOWN);
+  }
+
+  /**
+   * Get the ConnectionQuality that the moving bandwidth average currently represents.
+   * @return A ConnectionQuality representing the device's bandwidth at this exact moment.
+   */
+  public synchronized ConnectionQuality getCurrentBandwidthQuality() {
+    if (mDownloadBandwidth == null) {
+      return ConnectionQuality.UNKNOWN;
+    }
+    return mapBandwidthQuality(mDownloadBandwidth.getAverage());
+  }
+
+  private ConnectionQuality mapBandwidthQuality(double average) {
+    if (average < 0) {
+      return ConnectionQuality.UNKNOWN;
+    }
+    if (average < DEFAULT_POOR_BANDWIDTH) {
+      return ConnectionQuality.POOR;
+    }
+    if (average < DEFAULT_MODERATE_BANDWIDTH) {
+      return ConnectionQuality.MODERATE;
+    }
+    if (average < DEFAULT_GOOD_BANDWIDTH) {
+      return ConnectionQuality.GOOD;
+    }
+    return ConnectionQuality.EXCELLENT;
+  }
+
+
+  /**
+   * Accessor method for the current bandwidth average.
+   * @return The current bandwidth average, or -1 if no average has been recorded.
+   */
+  public synchronized double getDownloadKBitsPerSecond() {
+    return mDownloadBandwidth == null
+        ? -1.0
+        : mDownloadBandwidth.getAverage();
+  }
+
+  /**
+   * Interface for listening to when {@link com.facebook.network.connectionclass.ConnectionClassManager}
+   * changes state.
+   */
+  public interface ConnectionClassStateChangeListener {
+    /**
+     * The method that will be called when {@link com.facebook.network.connectionclass.ConnectionClassManager}
+     * changes ConnectionClass.
+     * @param bandwidthState The new ConnectionClass.
+     */
+    public void onBandwidthStateChange(ConnectionQuality bandwidthState);
+  }
+
+  /**
+   * Method for adding new listeners to this class.
+   * @param listener {@link ConnectionClassStateChangeListener} to add as a listener.
+   */
+  public ConnectionQuality register(ConnectionClassStateChangeListener listener) {
+    if (listener != null) {
+      mListenerList.add(listener);
+    }
+    return mCurrentBandwidthConnectionQuality.get();
+  }
+
+  /**
+   * Method for removing listeners from this class.
+   * @param listener Reference to the {@link ConnectionClassStateChangeListener} to be removed.
+   */
+  public void remove(ConnectionClassStateChangeListener listener) {
+    if (listener != null) {
+      mListenerList.remove(listener);
+    }
+  }
+
+  private void notifyListeners() {
+    int size = mListenerList.size();
+    for (int i = 0; i < size; i++) {
+      mListenerList.get(i).onBandwidthStateChange(mCurrentBandwidthConnectionQuality.get());
+    }
+  }
+}
\ No newline at end of file
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionQuality.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionQuality.java
new file mode 100644
index 0000000..1cf962a
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/ConnectionQuality.java
@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+/**
+ * A general enumeration for different connection qualities.
+ *
+ * <p>
+ * In order to compare qualities use the {@link .compareTo()} method. Qualities are ordered in increasing
+ * order of declaration as per the java docs for {@link java.lang.Enum}.
+ * </p>
+ */
+public enum ConnectionQuality {
+  /**
+   * Bandwidth under 150 kbps.
+   */
+  POOR,
+  /**
+   * Bandwidth between 150 and 550 kbps.
+   */
+  MODERATE,
+  /**
+   * Bandwidth between 550 and 2000 kbps.
+   */
+  GOOD,
+  /**
+   * EXCELLENT - Bandwidth over 2000 kbps.
+   */
+  EXCELLENT,
+  /**
+   * Placeholder for unknown bandwidth. This is the initial value and will stay at this value
+   * if a bandwidth cannot be accurately found.
+   */
+  UNKNOWN
+}
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/DeviceBandwidthSampler.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/DeviceBandwidthSampler.java
new file mode 100644
index 0000000..c9da403
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/DeviceBandwidthSampler.java
@@ -0,0 +1,135 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+import android.os.*;
+import android.os.Process;
+
+import javax.annotation.Nullable;
+import javax.annotation.Nonnull;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Class used to read from the file {@code /proc/net/xt_qtaguid/stats} periodically, in order to
+ * determine a ConnectionClass.
+ */
+public class DeviceBandwidthSampler {
+
+  /**
+   * Time between polls in ms.
+   */
+  static final long SAMPLE_TIME = 1000;
+
+  /**
+   * The DownloadBandwidthManager that keeps track of the moving average and ConnectionClass.
+   */
+  private final ConnectionClassManager mConnectionClassManager;
+
+  private AtomicInteger mSamplingCounter;
+
+  private Handler mHandler;
+  private HandlerThread mThread;
+
+  private long mLastTimeReading;
+
+  // Make BandwidthTimerManager a singleton.
+  @Nullable
+  private static DeviceBandwidthSampler sInstance;
+
+  /**
+   * Retrieval method for the BandwidthTimerManager singleton.
+   * @return The singleton instance of BandwidthTimerManager.
+   */
+  @Nonnull
+  public static DeviceBandwidthSampler getInstance() {
+    if (sInstance == null) {
+      sInstance = new DeviceBandwidthSampler(ConnectionClassManager.getInstance());
+    }
+    return sInstance;
+  }
+
+  private DeviceBandwidthSampler(
+      ConnectionClassManager connectionClassManager) {
+    mConnectionClassManager = connectionClassManager;
+    mSamplingCounter = new AtomicInteger();
+    mThread = new HandlerThread("ParseThread");
+    mThread.start();
+    mHandler = new SamplingHandler(mThread.getLooper());
+  }
+
+  /**
+   * Method call to start sampling for download bandwidth.
+   */
+  public void startSampling() {
+    if (mSamplingCounter.getAndIncrement() == 0) {
+      mHandler.sendEmptyMessage(SamplingHandler.MSG_START);
+      mLastTimeReading = SystemClock.elapsedRealtime();
+    }
+  }
+
+  /**
+   * Finish sampling and prevent further changes to the
+   * ConnectionClass until another timer is started.
+   */
+  public void stopSampling() {
+    if (mSamplingCounter.decrementAndGet() == 0) {
+      mHandler.sendEmptyMessage(SamplingHandler.MSG_STOP);
+    }
+  }
+
+  private class SamplingHandler extends Handler {
+    static final int MSG_START = 1;
+    static final int MSG_STOP = 2;
+
+    public SamplingHandler(Looper looper) {
+      super(looper);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+      switch (msg.what) {
+        case MSG_START:
+          addSample();
+          sendEmptyMessageDelayed(MSG_START, SAMPLE_TIME);
+          break;
+        case MSG_STOP:
+          addSample();
+          removeMessages(MSG_START);
+          break;
+        default:
+          throw new IllegalArgumentException("Unknown what=" + msg.what);
+      }
+    }
+
+    /**
+     * Method for polling for the change in total bytes since last update and
+     * adding it to the BandwidthManager.
+     */
+    private void addSample() {
+      long byteDiff = QTagParser.getInstance().parseDataUsageForUidAndTag(Process.myUid());
+      synchronized (this) {
+        long curTimeReading = SystemClock.elapsedRealtime();
+        if (byteDiff != -1) {
+          mConnectionClassManager.addBandwidth(byteDiff, curTimeReading - mLastTimeReading);
+        }
+        mLastTimeReading = curTimeReading;
+      }
+    }
+  }
+
+  /**
+   * @return True if there are still threads which are sampling, false otherwise.
+   */
+  public boolean isSampling() {
+    return (mSamplingCounter.get() != 0);
+  }
+}
\ No newline at end of file
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/ExponentialGeometricAverage.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/ExponentialGeometricAverage.java
new file mode 100644
index 0000000..9505d61
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/ExponentialGeometricAverage.java
@@ -0,0 +1,60 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+/**
+ * Moving average calculation for ConnectionClass.
+ */
+class ExponentialGeometricAverage {
+
+  private final double mDecayConstant;
+  private final int mCutover;
+
+  private double mValue = -1;
+  private int mCount;
+
+  public ExponentialGeometricAverage(double decayConstant) {
+    mDecayConstant = decayConstant;
+    mCutover = decayConstant == 0.0
+        ? Integer.MAX_VALUE
+        : (int) Math.ceil(1 / decayConstant);
+  }
+
+  /**
+   * Adds a new measurement to the moving average.
+   * @param measurement - Bandwidth measurement in bits/ms to add to the moving average.
+   */
+  public void addMeasurement(double measurement) {
+    double keepConstant = 1 - mDecayConstant;
+    if (mCount > mCutover) {
+      mValue = Math.exp(keepConstant * Math.log(mValue) + mDecayConstant * Math.log(measurement));
+    } else if (mCount > 0) {
+      double retained = keepConstant * mCount / (mCount + 1.0);
+      double newcomer = 1.0 - retained;
+      mValue = Math.exp(retained * Math.log(mValue) + newcomer * Math.log(measurement));
+    } else {
+      mValue = measurement;
+    }
+    mCount++;
+  }
+
+  public double getAverage() {
+    return mValue;
+  }
+
+  /**
+   * Reset the moving average.
+   */
+  public void reset() {
+    mValue = -1.0;
+    mCount = 0;
+  }
+}
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/LineBufferReader.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/LineBufferReader.java
new file mode 100644
index 0000000..e71244e
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/LineBufferReader.java
@@ -0,0 +1,90 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+/**
+ * Class for reading {@code /proc/net/xt_qtaguid/stats} line by line with a small,
+ * reusable byte buffer.
+ */
+class LineBufferReader {
+
+  private byte[] mFileBuffer;
+  private FileInputStream mInputStream;
+  private int mFileBufIndex;
+  private int mBytesInBuffer;
+
+  public LineBufferReader() {
+    mFileBuffer = new byte[512];
+  }
+
+  /**
+   * Sets the FileInputStream for reading.
+   * @param is The FileInputStream to set.
+   */
+  public void setFileStream (FileInputStream is) {
+    mInputStream = is;
+    mBytesInBuffer = 0;
+    mFileBufIndex = 0;
+  }
+
+  /**
+   * @param lineBuffer The buffer to fill with the current line.
+   * @return The index in the buffer at which the line terminates.
+   */
+  public int readLine(byte[] lineBuffer)
+      throws IOException{
+    if (mFileBufIndex >= mBytesInBuffer) {
+      mBytesInBuffer = mInputStream.read(mFileBuffer);
+      mFileBufIndex = 0;
+    }
+    int i;
+    for (i = 0; mBytesInBuffer != -1 && i < lineBuffer.length
+        && mFileBuffer[mFileBufIndex] != '\n'; i++) {
+      lineBuffer[i] = mFileBuffer[mFileBufIndex];
+      mFileBufIndex++;
+      if (mFileBufIndex >= mBytesInBuffer) {
+        mBytesInBuffer = mInputStream.read(mFileBuffer);
+        mFileBufIndex = 0;
+      }
+    }
+     // Move past the newline character.
+    mFileBufIndex++;
+     // If there are no more bytes to be read into the buffer,
+     // we have reached the end of this file. Exit.
+    if (mBytesInBuffer == -1) {
+      return -1;
+    }
+    return i;
+  }
+
+  /**
+   * Skips a line in the current file stream.
+   */
+  public void skipLine()
+      throws IOException {
+    if (mFileBufIndex >= mBytesInBuffer) {
+      mBytesInBuffer = mInputStream.read(mFileBuffer);
+      mFileBufIndex = 0;
+    }
+    for (int i = 0; mBytesInBuffer != -1 && mFileBuffer[mFileBufIndex] != '\n'; i++) {
+      mFileBufIndex++;
+      if (mFileBufIndex >= mBytesInBuffer) {
+        mBytesInBuffer = mInputStream.read(mFileBuffer);
+        mFileBufIndex = 0;
+      }
+    }
+    // Move past the newline character.
+    mFileBufIndex++;
+  }
+}
diff --git a/connectionclass/src/main/java/com/facebook/network/connectionclass/QTagParser.java b/connectionclass/src/main/java/com/facebook/network/connectionclass/QTagParser.java
new file mode 100644
index 0000000..4adf83b
--- /dev/null
+++ b/connectionclass/src/main/java/com/facebook/network/connectionclass/QTagParser.java
@@ -0,0 +1,149 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+import android.os.StrictMode;
+import android.util.Log;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.NoSuchElementException;
+
+/**
+ * Class for parsing total number of downloaded bytes
+ * from {@code /proc/net/xt_qtaguid/stats}.
+ */
+class QTagParser {
+  private static final String TAG = "QTagParser";
+  private static final String QTAGUID_UID_STATS = "/proc/net/xt_qtaguid/stats";
+
+  private static final ThreadLocal<byte[]> sLineBuffer = new ThreadLocal<byte[]>() {
+    @Override
+    public byte[] initialValue() {
+      return new byte[512];
+    }
+  };
+
+  private static long sPreviousBytes = -1;
+  private static LineBufferReader sStatsReader = new LineBufferReader();
+  private static ByteArrayScanner sScanner = new ByteArrayScanner();
+
+  @Nullable
+  public static QTagParser sInstance;
+
+  @Nonnull
+  public static synchronized QTagParser getInstance() {
+    if (sInstance == null) {
+      sInstance = new QTagParser(QTAGUID_UID_STATS);
+    }
+      return sInstance;
+  }
+
+  private String mPath;
+
+  // @VisibleForTesting
+  public QTagParser(String path) {
+    mPath = path;
+  }
+
+  /**
+   * Reads the qtaguid file and returns a difference from the previous read.
+   * @param uid The target uid to read bytes downloaded for.
+   * @return The difference between the current number of bytes downloaded and
+   */
+  public long parseDataUsageForUidAndTag(int uid) {
+    // The format of each line is
+    // idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes
+    // (There are many more fields but we are not interested in them)
+    // For us parts: 1, 2, 3 are to see if the line is relevant
+    // and part 5 is the received bytes
+    // (part numbers start from 0)
+
+    // Permit disk reads here, as /proc/net/xt_qtaguid/stats isn't really "on
+    // disk" and should be fast.
+    StrictMode.ThreadPolicy savedPolicy = StrictMode.allowThreadDiskReads();
+    try {
+      long tagRxBytes = 0;
+
+      FileInputStream fis = new FileInputStream(mPath);
+      sStatsReader.setFileStream(fis);
+      byte[] buffer = sLineBuffer.get();
+
+      try {
+        int length;
+        sStatsReader.skipLine(); // skip first line (headers)
+
+        int line = 2;
+        while ((length = sStatsReader.readLine(buffer)) != -1) {
+          try {
+
+            // Content is arranged in terms of:
+            // idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packets rx_tcp_bytes
+            // rx_tcp_packets rx_udp_bytes rx_udp_packets rx_other_bytes rx_other_packets tx_tcp_bytes tx_tcp_packets
+            // tx_udp_bytes tx_udp_packets tx_other_bytes tx_other_packets
+
+            // The ones we're interested in are:
+            // idx - ignore
+            // interface, filter out local interface ("lo")
+            // tag - ignore
+            // uid_tag_int, match it with the UID of interest
+            // cnt_set - ignore
+            // rx_bytes
+
+            sScanner.reset(buffer, length);
+            sScanner.useDelimiter(' ');
+
+            sScanner.skip();
+            if (sScanner.nextStringEquals("lo")) {
+              continue;
+            }
+            sScanner.skip();
+            if (sScanner.nextInt() != uid) {
+              continue;
+            }
+            sScanner.skip();
+            int rxBytes = sScanner.nextInt();
+            tagRxBytes += rxBytes;
+            line++;
+            // If the line is incorrectly formatted, ignore the line.
+          } catch (NumberFormatException e) {
+            Log.e(TAG, "Cannot parse byte count at line" + line + ".");
+            continue;
+          } catch (NoSuchElementException e) {
+            Log.e(TAG, "Invalid number of tokens on line " + line + ".");
+            continue;
+          }
+        }
+      } finally {
+        fis.close();
+      }
+
+      if (sPreviousBytes == -1) {
+        sPreviousBytes = tagRxBytes;
+        return -1;
+      }
+      long diff = tagRxBytes - sPreviousBytes;
+      sPreviousBytes = tagRxBytes;
+      return diff;
+
+    } catch (IOException e) {
+      Log.e (TAG, "Error reading from /proc/net/xt_qtaguid/stats. Please check if this file exists.");
+    } finally {
+      StrictMode.setThreadPolicy(savedPolicy);
+    }
+
+    // Return -1 upon error.
+    return -1;
+  }
+}
\ No newline at end of file
diff --git a/connectionclass/src/test/java/com/facebook/network/connectionclass/ConnectionClassTest.java b/connectionclass/src/test/java/com/facebook/network/connectionclass/ConnectionClassTest.java
new file mode 100644
index 0000000..089107e
--- /dev/null
+++ b/connectionclass/src/test/java/com/facebook/network/connectionclass/ConnectionClassTest.java
@@ -0,0 +1,172 @@
+/*
+ *  Copyright (c) 2015, Facebook, Inc.
+ *  All rights reserved.
+ *
+ *  This source code is licensed under the BSD-style license found in the
+ *  LICENSE file in the root directory of this source tree. An additional grant
+ *  of patent rights can be found in the PATENTS file in the same directory.
+ *
+ */
+
+package com.facebook.network.connectionclass;
+
+import android.os.StrictMode;
+import android.util.Log;
+import com.facebook.network.connectionclass.ConnectionClassManager;
+import com.facebook.network.connectionclass.QTagParser;
+import dalvik.annotation.TestTargetClass;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.powermock.api.mockito.PowerMockito;
+import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.modules.junit4.PowerMockRunner;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+import static org.powermock.api.mockito.PowerMockito.*;
+
+@RunWith(PowerMockRunner.class)
+public class ConnectionClassTest {
+
+  @Mock
+  public ConnectionClassManager mConnectionClassManager;
+  public TestBandwidthStateChangeListener mTestBandwidthStateChangeListener;
+
+  @Before
+  public void setUp() {
+    mConnectionClassManager = ConnectionClassManager.getInstance();
+    mTestBandwidthStateChangeListener = new TestBandwidthStateChangeListener();
+  }
+
+  //Test the moving average to make sure correct results are returned.
+  @Test
+  public void TestMovingAverage() {
+    mConnectionClassManager.reset();
+    mConnectionClassManager.addBandwidth(620000L, 1000L);
+    mConnectionClassManager.addBandwidth(630000L, 1000L);
+    mConnectionClassManager.addBandwidth(670000L, 1000L);
+    mConnectionClassManager.addBandwidth(500000L, 1000L);
+    mConnectionClassManager.addBandwidth(550000L, 1000L);
+    mConnectionClassManager.addBandwidth(590000L, 1000L);
+    assertEquals(ConnectionQuality.EXCELLENT, mConnectionClassManager.getCurrentBandwidthQuality());
+  }
+
+  //Test that values under the lower bandwidth bound do not affect the final ConnectionClass values.
+  @Test
+  public void TestGarbageValues() {
+    mConnectionClassManager.reset();
+    mConnectionClassManager.addBandwidth(620000L, 1000L);
+    mConnectionClassManager.addBandwidth(0L, 1000L);
+    mConnectionClassManager.addBandwidth(630000L, 1000L);
+    mConnectionClassManager.addBandwidth(5L, 1000L);
+    mConnectionClassManager.addBandwidth(10L, 1000L);
+    mConnectionClassManager.addBandwidth(0L, 1000L);
+    mConnectionClassManager.addBandwidth(90L, 1000L);
+    mConnectionClassManager.addBandwidth(200L, 1000L);
+    mConnectionClassManager.addBandwidth(670000L, 1000L);
+    mConnectionClassManager.addBandwidth(500000L, 1000L);
+    mConnectionClassManager.addBandwidth(550000L, 1000L);
+    mConnectionClassManager.addBandwidth(590000L, 1000L);
+    assertEquals(ConnectionQuality.EXCELLENT, mConnectionClassManager.getCurrentBandwidthQuality());
+  }
+
+  @Test
+  public void testStateChangeBroadcastNoBroadcast() {
+    mConnectionClassManager.reset();
+    for (int i = 0; i < ConnectionClassManager.DEFAULT_SAMPLES_TO_QUALITY_CHANGE - 1; i++) {
+      mConnectionClassManager.addBandwidth(1000, 2);
+    }
+    assertEquals(0, mTestBandwidthStateChangeListener.getNumberOfStateChanges());
+  }
+
+  @Test
+  public void testStateChangeBroadcastWithBroadcast() {
+    mConnectionClassManager.reset();
+    for (int i = 0; i < ConnectionClassManager.DEFAULT_SAMPLES_TO_QUALITY_CHANGE + 1; i++) {
+      mConnectionClassManager.addBandwidth(1000, 2);
+    }
+    assertEquals(1, mTestBandwidthStateChangeListener.getNumberOfStateChanges());
+    assertEquals(ConnectionQuality.EXCELLENT, mTestBandwidthStateChangeListener.getLastBandwidthState());
+  }
+
+  @Test
+  public void testStateChangeBroadcastDoesNotRepeatItself() {
+    mConnectionClassManager.reset();
+    for (int i = 0; i < 3 * ConnectionClassManager.DEFAULT_SAMPLES_TO_QUALITY_CHANGE + 1; i++) {
+      mConnectionClassManager.addBandwidth(1000, 2);
+    }
+    assertEquals(1, mTestBandwidthStateChangeListener.getNumberOfStateChanges());
+  }
+
+  @PrepareForTest(StrictMode.class)
+  @Test
+  public void testParserWithExpectedInput()
+      throws Exception {
+    int testUid = 10237;
+    PowerMockito.mockStatic(StrictMode.class);
+    PowerMockito.doNothing().when(StrictMode.class, "setThreadPolicy", Matchers.anyObject());
+    QTagParser testParser =
+        new QTagParser("src/test/java/com/facebook/network/connectionclass/sampleqtaguidstats.txt");
+    long result = testParser.parseDataUsageForUidAndTag(testUid);
+    assertEquals(-1, result);
+    result = testParser.parseDataUsageForUidAndTag(testUid);
+    assertEquals(0, result);
+  }
+
+  @PrepareForTest({StrictMode.class,Log.class})
+  @Test
+  public void testParserDoesNotCrashOnWrongNumberOfTokens()
+      throws Exception {
+    PowerMockito.mockStatic(StrictMode.class);
+    PowerMockito.doNothing().when(StrictMode.class, "setThreadPolicy", Matchers.anyObject());
+    PowerMockito.mockStatic(Log.class);
+    PowerMockito.doReturn(1).when(Log.class, "e", Matchers.anyString(), Matchers.anyString());
+    QTagParser testParser =
+        new QTagParser("src/test/java/com/facebook/network/connectionclass/strangelytokenedfile.txt");
+    testParser.parseDataUsageForUidAndTag(0);
+  }
+
+  @PrepareForTest({StrictMode.class,Log.class})
+  @Test
+  public void testParserDoesNotCrashOnInvalidRxBytes()
+      throws Exception {
+    PowerMockito.mockStatic(StrictMode.class);
+    PowerMockito.doNothing().when(StrictMode.class, "setThreadPolicy", Matchers.anyObject());
+    PowerMockito.mockStatic(Log.class);
+    PowerMockito.doReturn(1).when(Log.class, "e", Matchers.anyString(), Matchers.anyString());
+    QTagParser testParser =
+        new QTagParser("src/test/java/com/facebook/network/connectionclass/invalidrxbytes.txt");
+    testParser.parseDataUsageForUidAndTag(0);
+  }
+
+  private class TestBandwidthStateChangeListener implements
+      ConnectionClassManager.ConnectionClassStateChangeListener {
+
+    private int mNumberOfStateChanges = 0;
+    private ConnectionQuality mLastBandwidthState;
+
+    private TestBandwidthStateChangeListener() {
+      mConnectionClassManager.register(this);
+    }
+
+    @Override
+    public void onBandwidthStateChange(ConnectionQuality bandwidthState) {
+      mNumberOfStateChanges += 1;
+      mLastBandwidthState = bandwidthState;
+    }
+
+    public int getNumberOfStateChanges() {
+      return mNumberOfStateChanges;
+    }
+
+    public ConnectionQuality getLastBandwidthState() {
+      return mLastBandwidthState;
+    }
+  }
+}
diff --git a/connectionclass/src/test/java/com/facebook/network/connectionclass/invalidrxbytes.txt b/connectionclass/src/test/java/com/facebook/network/connectionclass/invalidrxbytes.txt
new file mode 100644
index 0000000..b9b8abd
--- /dev/null
+++ b/connectionclass/src/test/java/com/facebook/network/connectionclass/invalidrxbytes.txt
@@ -0,0 +1,2 @@
+idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packets rx_tcp_bytes rx_tcp_packets rx_udp_bytes rx_udp_packets rx_other_bytes rx_other_packets tx_tcp_bytes tx_tcp_packets tx_udp_bytes tx_udp_packets tx_other_bytes tx_other_packets
+2 wlan0 0x0 0 1 INVALID_INPUT 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
\ No newline at end of file
diff --git a/connectionclass/src/test/java/com/facebook/network/connectionclass/sampleqtaguidstats.txt b/connectionclass/src/test/java/com/facebook/network/connectionclass/sampleqtaguidstats.txt
new file mode 100644
index 0000000..0605616
--- /dev/null
+++ b/connectionclass/src/test/java/com/facebook/network/connectionclass/sampleqtaguidstats.txt
@@ -0,0 +1,241 @@
+idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packets rx_tcp_bytes rx_tcp_packets rx_udp_bytes rx_udp_packets rx_other_bytes rx_other_packets tx_tcp_bytes tx_tcp_packets tx_udp_bytes tx_udp_packets tx_other_bytes tx_other_packets
+2 wlan0 0x0 0 0 3026185 22039 2473992 29220 1242559 5875 1215534 5289 568092 10875 1026275 10700 402005 6030 1045712 12490
+3 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+4 wlan0 0x0 1000 0 495784 1469 694742 2070 437027 909 58093 553 664 7 646114 1410 48628 660 0 0
+5 wlan0 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+6 wlan0 0x0 1014 0 346 1 337 1 0 0 346 1 0 0 0 0 337 1 0 0
+7 wlan0 0x0 1014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+8 wlan0 0x0 2000 0 0 0 2268 27 0 0 0 0 0 0 0 0 0 0 2268 27
+9 wlan0 0x0 2000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+10 wlan0 0x0 10002 0 62615 50 4585 60 62615 50 0 0 0 0 4585 60 0 0 0 0
+11 wlan0 0x0 10002 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+12 wlan0 0x0 10009 0 1428777 1059 26009 594 1428777 1059 0 0 0 0 26009 594 0 0 0 0
+13 wlan0 0x0 10009 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+14 wlan0 0x0 10014 0 2256208 8061 4968203 13954 2252512 8019 0 0 3696 42 4968203 13954 0 0 0 0
+15 wlan0 0x0 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+16 wlan0 0x0 10015 0 1706 31 2496 48 1706 31 0 0 0 0 2496 48 0 0 0 0
+17 wlan0 0x0 10015 1 82473 86 11839 109 82473 86 0 0 0 0 11839 109 0 0 0 0
+18 wlan0 0x0 10024 0 0 0 92 2 0 0 0 0 0 0 92 2 0 0 0 0
+19 wlan0 0x0 10024 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+20 wlan0 0x0 10035 0 15979592 11388 294940 2711 15979592 11388 0 0 0 0 294940 2711 0 0 0 0
+21 wlan0 0x0 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+22 wlan0 0x0 10038 0 8520 25 6055 32 8520 25 0 0 0 0 6055 32 0 0 0 0
+23 wlan0 0x0 10038 1 153890 431 163228 470 153890 431 0 0 0 0 163228 470 0 0 0 0
+24 wlan0 0x0 10045 0 92655 573 66715 646 92655 573 0 0 0 0 66715 646 0 0 0 0
+25 wlan0 0x0 10045 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+26 wlan0 0x0 10050 0 156 3 260 5 156 3 0 0 0 0 260 5 0 0 0 0
+27 wlan0 0x0 10050 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+28 wlan0 0x0 10065 0 647225 1854 730575 2631 646969 1852 0 0 256 2 730575 2631 0 0 0 0
+29 wlan0 0x0 10065 1 949692 1200 260633 1114 949692 1200 0 0 0 0 260633 1114 0 0 0 0
+30 wlan0 0x0 10077 0 34843 54 5669 58 34843 54 0 0 0 0 5669 58 0 0 0 0
+31 wlan0 0x0 10077 1 38758 85 12189 102 38758 85 0 0 0 0 12189 102 0 0 0 0
+32 wlan0 0x0 10084 0 355491 1716 199444 1304 15636 20 339855 1696 0 0 2436 30 197008 1274 0 0
+33 wlan0 0x0 10084 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+34 wlan0 0x0 10096 0 968673 1022 163672 1248 968673 1022 0 0 0 0 163672 1248 0 0 0 0
+35 wlan0 0x0 10096 1 5519381 4656 430306 3733 5519381 4656 0 0 0 0 394901 3703 35405 30 0 0
+36 wlan0 0x0 10106 0 106979 95 7821 76 106979 95 0 0 0 0 7821 76 0 0 0 0
+37 wlan0 0x0 10106 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+38 wlan0 0x0 10108 0 8297 11 3062 14 8297 11 0 0 0 0 3062 14 0 0 0 0
+39 wlan0 0x0 10108 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+40 wlan0 0x0 10116 0 385590 694 146000 885 385590 694 0 0 0 0 146000 885 0 0 0 0
+41 wlan0 0x0 10116 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+42 wlan0 0x0 10117 0 409951 840 191421 1028 409951 840 0 0 0 0 191421 1028 0 0 0 0
+43 wlan0 0x0 10117 1 6979210 6047 645575 4007 6979210 6047 0 0 0 0 645575 4007 0 0 0 0
+44 wlan0 0x0 10120 0 5999 12 1790 13 5999 12 0 0 0 0 1790 13 0 0 0 0
+45 wlan0 0x0 10120 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+46 wlan0 0x0 10121 0 6386 13 2445 18 6386 13 0 0 0 0 2445 18 0 0 0 0
+47 wlan0 0x0 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+48 wlan0 0x0 10122 0 26879 31 5054 53 26879 31 0 0 0 0 5054 53 0 0 0 0
+49 wlan0 0x0 10122 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+50 wlan0 0x0 10124 0 106245 94 10183 94 106245 94 0 0 0 0 10183 94 0 0 0 0
+51 wlan0 0x0 10124 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+52 wlan0 0x0 10139 0 14140 26 6752 32 14140 26 0 0 0 0 6752 32 0 0 0 0
+53 wlan0 0x0 10139 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+54 wlan0 0x0 10150 0 143212 588 104551 777 143212 588 0 0 0 0 104551 777 0 0 0 0
+55 wlan0 0x0 10150 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+56 wlan0 0x0 10154 0 5898 12 1384 17 5898 12 0 0 0 0 1384 17 0 0 0 0
+57 wlan0 0x0 10154 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+58 wlan0 0x0 10163 0 919 7 3845 10 919 7 0 0 0 0 3845 10 0 0 0 0
+59 wlan0 0x0 10163 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+60 wlan0 0x0 10179 0 2654789 10123 1716958 10628 2653909 10113 0 0 880 10 1716958 10628 0 0 0 0
+61 wlan0 0x0 10179 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+62 wlan0 0x0 10186 0 8050 19 3501 25 8050 19 0 0 0 0 3501 25 0 0 0 0
+63 wlan0 0x0 10186 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+64 wlan0 0x0 10200 0 107576 171 24300 218 107576 171 0 0 0 0 24300 218 0 0 0 0
+65 wlan0 0x0 10200 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+66 wlan0 0x0 10201 0 383143 532 55762 649 383143 532 0 0 0 0 55762 649 0 0 0 0
+67 wlan0 0x0 10201 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+68 wlan0 0x0 10203 0 4622 7 1421 11 4622 7 0 0 0 0 1421 11 0 0 0 0
+69 wlan0 0x0 10203 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+70 wlan0 0x0 10209 0 231756 533 266171 708 231756 533 0 0 0 0 266171 708 0 0 0 0
+71 wlan0 0x0 10209 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+72 wlan0 0x0 10211 0 953677 4006 577850 4840 868550 2891 84623 1106 504 9 439930 3662 137920 1178 0 0
+73 wlan0 0x0 10211 1 607925 1994 340149 2478 545281 1626 62588 367 56 1 272978 1995 67171 483 0 0
+74 wlan0 0x0 10212 0 2471520 5805 1015249 8051 2471520 5805 0 0 0 0 1015249 8051 0 0 0 0
+75 wlan0 0x0 10212 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+76 wlan0 0x0 10213 0 4736656 27608 7169532 31353 4525352 26423 210096 1172 1208 13 6866304 30078 303228 1275 0 0
+77 wlan0 0x0 10213 1 485079 3249 963784 3367 403198 2631 80921 608 960 10 869604 2740 94180 627 0 0
+78 wlan0 0x0 10216 0 181234 356 82968 464 181234 356 0 0 0 0 82968 464 0 0 0 0
+79 wlan0 0x0 10216 1 1044011 865 94056 914 1044011 865 0 0 0 0 94056 914 0 0 0 0
+80 wlan0 0x0 10217 0 23033 54 9696 66 23033 54 0 0 0 0 9696 66 0 0 0 0
+81 wlan0 0x0 10217 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+82 wlan0 0x0 10218 0 3374073 11947 2371567 14477 3373545 11941 0 0 528 6 2371567 14477 0 0 0 0
+83 wlan0 0x0 10218 1 10363279 8323 458275 4724 10363279 8323 0 0 0 0 458275 4724 0 0 0 0
+84 wlan0 0x0 10219 0 897577 1345 229290 1730 897577 1345 0 0 0 0 229290 1730 0 0 0 0
+85 wlan0 0x0 10219 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+86 wlan0 0x0 10232 0 1268 16 3763 22 1268 16 0 0 0 0 3763 22 0 0 0 0
+87 wlan0 0x0 10232 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+88 wlan0 0x0 10237 0 117548562 82935 1480172 26735 117548562 82935 0 0 0 0 1480172 26735 0 0 0 0
+89 wlan0 0x0 10237 1 882822045 618664 10860224 198713 882822045 618664 0 0 0 0 10860224 198713 0 0 0 0
+90 wlan0 0x0 10240 0 7873 35 8538 58 7873 35 0 0 0 0 8538 58 0 0 0 0
+91 wlan0 0x0 10240 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+92 wlan0 0x100000000 10065 0 146439 272 96863 385 146439 272 0 0 0 0 96863 385 0 0 0 0
+93 wlan0 0x100000000 10065 1 40189 87 45233 106 40189 87 0 0 0 0 45233 106 0 0 0 0
+94 wlan0 0x200000000 10065 0 20534 35 7394 35 20534 35 0 0 0 0 7394 35 0 0 0 0
+95 wlan0 0x200000000 10065 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+96 wlan0 0x500000000 10065 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+97 wlan0 0x500000000 10065 1 475 2 1999 2 475 2 0 0 0 0 1999 2 0 0 0 0
+98 wlan0 0x800000000 10065 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+99 wlan0 0x800000000 10065 1 11235 18 3862 19 11235 18 0 0 0 0 3862 19 0 0 0 0
+100 wlan0 0xb00000000 10065 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+101 wlan0 0xb00000000 10065 1 266006 266 59385 277 266006 266 0 0 0 0 59385 277 0 0 0 0
+102 wlan0 0xd00000000 10065 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+103 wlan0 0xd00000000 10065 1 11474 30 16479 35 11474 30 0 0 0 0 16479 35 0 0 0 0
+104 wlan0 0xf00000000 10065 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+105 wlan0 0xf00000000 10065 1 109513 121 23818 103 109513 121 0 0 0 0 23818 103 0 0 0 0
+106 wlan0 0x36621600000000 10014 0 1549 10 2405 24 1549 10 0 0 0 0 2405 24 0 0 0 0
+107 wlan0 0x36621600000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+108 wlan0 0xdc4e7700000000 10014 0 217071 470 121165 911 217071 470 0 0 0 0 121165 911 0 0 0 0
+109 wlan0 0xdc4e7700000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+110 wlan0 0x1000000400000000 10121 0 988 3 762 3 988 3 0 0 0 0 762 3 0 0 0 0
+111 wlan0 0x1000000400000000 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+112 wlan0 0x1010000000000000 10120 0 5947 11 1686 11 5947 11 0 0 0 0 1686 11 0 0 0 0
+113 wlan0 0x1010000000000000 10120 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+114 wlan0 0x1100000000000000 10121 0 5346 9 1579 13 5346 9 0 0 0 0 1579 13 0 0 0 0
+115 wlan0 0x1100000000000000 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+116 wlan0 0x1144000400000000 10014 0 1416 3 966 2 1416 3 0 0 0 0 966 2 0 0 0 0
+117 wlan0 0x1144000400000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+118 wlan0 0x1244000400000000 10014 0 6064 10 1739 11 6064 10 0 0 0 0 1739 11 0 0 0 0
+119 wlan0 0x1244000400000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+120 wlan0 0x30b75e1c00000000 10014 0 16249 28 6696 38 16249 28 0 0 0 0 6696 38 0 0 0 0
+121 wlan0 0x30b75e1c00000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+122 wlan0 0xc9395b2600000000 10035 0 5494 10 2789 14 5494 10 0 0 0 0 2789 14 0 0 0 0
+123 wlan0 0xc9395b2600000000 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+124 wlan0 0xe8d195d100000000 10035 0 21532 42 19368 52 21532 42 0 0 0 0 19368 52 0 0 0 0
+125 wlan0 0xe8d195d100000000 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+126 wlan0 0xffffff0100000000 10002 0 62615 50 4585 60 62615 50 0 0 0 0 4585 60 0 0 0 0
+127 wlan0 0xffffff0100000000 10002 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+128 wlan0 0xffffff0100000000 10035 0 15467283 10887 119075 2213 15467283 10887 0 0 0 0 119075 2213 0 0 0 0
+129 wlan0 0xffffff0100000000 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+130 wlan0 0xffffff0300000000 1000 0 137594 375 129657 599 137594 375 0 0 0 0 129657 599 0 0 0 0
+131 wlan0 0xffffff0300000000 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+132 wlan0 0xffffff0300000000 10035 0 492 2 867 2 492 2 0 0 0 0 867 2 0 0 0 0
+133 wlan0 0xffffff0300000000 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+134 wlan0 0xffffff0300000000 10163 0 919 7 3845 10 919 7 0 0 0 0 3845 10 0 0 0 0
+135 wlan0 0xffffff0300000000 10163 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+136 rmnet1 0x0 0 0 175285 425 444 5 893 1 0 0 174392 424 60 1 0 0 384 4
+137 rmnet1 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+138 rmnet1 0x0 1000 0 161713 452 792860 1218 153293 441 8420 11 0 0 381726 626 8582 10 402552 582
+139 rmnet1 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+140 rmnet0 0x0 0 0 96900 1061 72779 1060 36765 594 60135 467 0 0 27601 490 31828 508 13350 62
+141 rmnet0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+142 rmnet0 0x0 1000 0 22776 144 16903 162 14340 33 8436 111 0 0 7707 41 9196 121 0 0
+143 rmnet0 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+144 rmnet0 0x0 10009 0 665605 510 13442 255 665605 510 0 0 0 0 13442 255 0 0 0 0
+145 rmnet0 0x0 10009 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+146 rmnet0 0x0 10014 0 447277 1163 273421 1360 447277 1163 0 0 0 0 273421 1360 0 0 0 0
+147 rmnet0 0x0 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+148 rmnet0 0x0 10024 0 4886 10 1758 13 4886 10 0 0 0 0 1758 13 0 0 0 0
+149 rmnet0 0x0 10024 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+150 rmnet0 0x0 10053 0 76814 61 4175 65 76814 61 0 0 0 0 4175 65 0 0 0 0
+151 rmnet0 0x0 10053 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+152 rmnet0 0x0 10065 0 66234 207 60003 228 66234 207 0 0 0 0 60003 228 0 0 0 0
+153 rmnet0 0x0 10065 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+154 rmnet0 0x0 10116 0 41128 78 15788 96 41128 78 0 0 0 0 15788 96 0 0 0 0
+155 rmnet0 0x0 10116 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+156 rmnet0 0x0 10117 0 58572 152 34550 174 58572 152 0 0 0 0 34550 174 0 0 0 0
+157 rmnet0 0x0 10117 1 2936462 2997 489540 2987 2936462 2997 0 0 0 0 489540 2987 0 0 0 0
+158 rmnet0 0x0 10120 0 12031 27 5520 38 12031 27 0 0 0 0 5520 38 0 0 0 0
+159 rmnet0 0x0 10120 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+160 rmnet0 0x0 10121 0 12702 23 4362 28 12702 23 0 0 0 0 4362 28 0 0 0 0
+161 rmnet0 0x0 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+162 rmnet0 0x0 10139 0 6630 12 2579 14 6630 12 0 0 0 0 2579 14 0 0 0 0
+163 rmnet0 0x0 10139 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+164 rmnet0 0x0 10150 0 5915 16 3218 21 5915 16 0 0 0 0 3218 21 0 0 0 0
+165 rmnet0 0x0 10150 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+166 rmnet0 0x0 10154 0 8675 15 1198 11 8675 15 0 0 0 0 1198 11 0 0 0 0
+167 rmnet0 0x0 10154 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+168 rmnet0 0x0 10179 0 283037 1033 170144 1080 283037 1033 0 0 0 0 170144 1080 0 0 0 0
+169 rmnet0 0x0 10179 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+170 rmnet0 0x0 10212 0 537098 1418 253321 1528 537098 1418 0 0 0 0 253321 1528 0 0 0 0
+171 rmnet0 0x0 10212 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+172 rmnet0 0x0 10213 0 615273 3600 899590 3849 615273 3600 0 0 0 0 899590 3849 0 0 0 0
+173 rmnet0 0x0 10213 1 5955 23 2878 27 5955 23 0 0 0 0 2878 27 0 0 0 0
+174 rmnet0 0x0 10218 0 690129 1552 241392 1627 690129 1552 0 0 0 0 241392 1627 0 0 0 0
+175 rmnet0 0x0 10218 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+176 rmnet0 0x0 10219 0 103805 160 28346 201 103805 160 0 0 0 0 28346 201 0 0 0 0
+177 rmnet0 0x0 10219 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+178 rmnet0 0x100000000 10065 0 10794 17 5392 21 10794 17 0 0 0 0 5392 21 0 0 0 0
+179 rmnet0 0x100000000 10065 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+180 rmnet0 0xdc4e7700000000 10014 0 21040 49 10676 57 21040 49 0 0 0 0 10676 57 0 0 0 0
+181 rmnet0 0xdc4e7700000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+182 rmnet0 0x1000000400000000 10121 0 2019 5 1472 5 2019 5 0 0 0 0 1472 5 0 0 0 0
+183 rmnet0 0x1000000400000000 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+184 rmnet0 0x1010000000000000 10120 0 11927 25 5352 35 11927 25 0 0 0 0 5352 35 0 0 0 0
+185 rmnet0 0x1010000000000000 10120 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+186 rmnet0 0x1100000000000000 10121 0 10631 17 2786 21 10631 17 0 0 0 0 2786 21 0 0 0 0
+187 rmnet0 0x1100000000000000 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+188 rmnet0 0x1144000400000000 10014 0 2833 6 2036 6 2833 6 0 0 0 0 2036 6 0 0 0 0
+189 rmnet0 0x1144000400000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+190 rmnet0 0x1244000400000000 10014 0 12525 23 3738 27 12525 23 0 0 0 0 3738 27 0 0 0 0
+191 rmnet0 0x1244000400000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+192 rmnet0 0x30b75e1c00000000 10014 0 16564 28 6378 34 16564 28 0 0 0 0 6378 34 0 0 0 0
+193 rmnet0 0x30b75e1c00000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+194 rmnet0 0xffffff0300000000 1000 0 13920 27 7182 35 13920 27 0 0 0 0 7182 35 0 0 0 0
+195 rmnet0 0xffffff0300000000 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+196 p2p0 0x0 0 0 0 0 768 12 0 0 0 0 0 0 0 0 0 0 768 12
+197 p2p0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+198 lo 0x0 0 0 359573 2725 1076146 7457 828 15 0 0 358745 2710 948 21 0 0 1075198 7436
+199 lo 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+200 lo 0x0 1000 0 1744 14 0 0 0 0 0 0 1744 14 0 0 0 0 0 0
+201 lo 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+202 lo 0x0 1013 0 312 6 364 7 312 6 0 0 0 0 364 7 0 0 0 0
+203 lo 0x0 1013 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+204 lo 0x0 10002 0 256 2 0 0 0 0 0 0 256 2 0 0 0 0 0 0
+205 lo 0x0 10002 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+206 lo 0x0 10014 0 118437 751 0 0 0 0 0 0 118437 751 0 0 0 0 0 0
+207 lo 0x0 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+208 lo 0x0 10035 0 384 3 0 0 0 0 0 0 384 3 0 0 0 0 0 0
+209 lo 0x0 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+210 lo 0x0 10065 0 33329 66 0 0 0 0 0 0 33329 66 0 0 0 0 0 0
+211 lo 0x0 10065 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+212 lo 0x0 10117 0 768 6 0 0 0 0 0 0 768 6 0 0 0 0 0 0
+213 lo 0x0 10117 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+214 lo 0x0 10121 0 128 1 0 0 0 0 0 0 128 1 0 0 0 0 0 0
+215 lo 0x0 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+216 lo 0x0 10150 0 897 3 0 0 0 0 0 0 897 3 0 0 0 0 0 0
+217 lo 0x0 10150 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+218 lo 0x0 10211 0 30013 1030 29965 1029 160 4 29725 1025 128 1 240 4 29725 1025 0 0
+219 lo 0x0 10211 1 15421 531 15461 531 80 2 15341 529 0 0 120 2 15341 529 0 0
+220 lo 0x0 10212 0 88 1 0 0 0 0 0 0 88 1 0 0 0 0 0 0
+221 lo 0x0 10212 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+222 lo 0x0 10213 0 12434 90 0 0 0 0 0 0 12434 90 0 0 0 0 0 0
+223 lo 0x0 10213 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+224 lo 0x0 10218 0 10133 69 0 0 0 0 0 0 10133 69 0 0 0 0 0 0
+225 lo 0x0 10218 1 6024056 2386 6024160 2388 6024056 2386 0 0 0 0 6024160 2388 0 0 0 0
+226 lo 0x0 10240 0 128 1 0 0 0 0 0 0 128 1 0 0 0 0 0 0
+227 lo 0x0 10240 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+228 lo 0x100000000 10065 0 1280 10 0 0 0 0 0 0 1280 10 0 0 0 0 0 0
+229 lo 0x100000000 10065 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+230 lo 0x3f500000000 10218 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+231 lo 0x3f500000000 10218 1 5971432 1432 52728 956 5971432 1432 0 0 0 0 52728 956 0 0 0 0
+232 lo 0x1100000000000000 10121 0 128 1 0 0 0 0 0 0 128 1 0 0 0 0 0 0
+233 lo 0x1100000000000000 10121 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+234 lo 0x30b75e1c00000000 10014 0 256 2 0 0 0 0 0 0 256 2 0 0 0 0 0 0
+235 lo 0x30b75e1c00000000 10014 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+236 lo 0xc9395b2600000000 10035 0 128 1 0 0 0 0 0 0 128 1 0 0 0 0 0 0
+237 lo 0xc9395b2600000000 10035 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+238 lo 0xffffff0100000000 10002 0 256 2 0 0 0 0 0 0 256 2 0 0 0 0 0 0
+239 lo 0xffffff0100000000 10002 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
+240 lo 0xffffff0300000000 1000 0 1536 12 0 0 0 0 0 0 1536 12 0 0 0 0 0 0
+241 lo 0xffffff0300000000 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
diff --git a/connectionclass/src/test/java/com/facebook/network/connectionclass/strangelytokenedfile.txt b/connectionclass/src/test/java/com/facebook/network/connectionclass/strangelytokenedfile.txt
new file mode 100644
index 0000000..7e70ca4
--- /dev/null
+++ b/connectionclass/src/test/java/com/facebook/network/connectionclass/strangelytokenedfile.txt
@@ -0,0 +1,5 @@
+1 2 3 4 5 6
+7 8 9 10 11 12 13 14 15
+
+
+7 8 9 10 11 12 13 14 15
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..b61865e
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+VERSION_NAME=1.0.0
+GROUP=com.facebook.network.connectionclass
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..8c0fb64
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..2c4ec1b
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Fri Feb 27 10:06:58 PST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/release.gradle b/release.gradle
new file mode 100644
index 0000000..fa17ba3
--- /dev/null
+++ b/release.gradle
@@ -0,0 +1,110 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def isReleaseBuild() {
+    return VERSION_NAME.contains("SNAPSHOT") == false
+}
+
+def getRepositoryUrl() {
+    return hasProperty('repositoryUrl') ? property('repositoryUrl') : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+}
+
+def getRepositoryUsername() {
+    return hasProperty('repositoryUsername') ? property('repositoryUsername') : ""
+}
+
+def getRepositoryPassword() {
+    return hasProperty('repositoryPassword') ? property('repositoryPassword') : ""
+}
+
+afterEvaluate { project ->
+    task androidJavadoc(type: Javadoc) {
+        source = android.sourceSets.main.java.srcDirs
+        classpath += files(android.bootClasspath)
+    }
+
+    task androidJavadocJar(type: Jar) {
+        classifier = 'javadoc'
+        from androidJavadoc.destinationDir
+    }
+
+    task androidSourcesJar(type: Jar) {
+        classifier = 'sources'
+        from android.sourceSets.main.java.srcDirs
+    }
+
+    android.libraryVariants.all { variant ->
+        def name = variant.name.capitalize()
+        task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
+            from variant.javaCompile.destinationDir
+        }
+    }
+
+    artifacts {
+        archives androidJavadocJar
+        archives androidSourcesJar
+        archives jarRelease
+    }
+
+    version = VERSION_NAME
+    group = GROUP
+
+    signing {
+        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+        sign configurations.archives
+    }
+
+    uploadArchives {
+        configuration = configurations.archives
+        repositories.mavenDeployer {
+            beforeDeployment {
+                MavenDeployment deployment -> signing.signPom(deployment)
+            }
+
+            repository(url: getRepositoryUrl()) {
+                authentication(
+                        userName: getRepositoryUsername(),
+                        password: getRepositoryPassword())
+
+            }
+
+            pom.project {
+                name POM_NAME
+                artifactId POM_ARTIFACT_ID
+                packaging POM_PACKAGING
+                description 'Android Network Connection Class Library'
+                url 'https://github.com/facebook/network-connection-class'
+
+                scm {
+                    url 'https://github.com/facebook/network-connection-class.git'
+                    connection 'scm:git:https://github.com/facebook/network-connection-class.git'
+                    developerConnection 'scm:git:git@github.com:facebook/network-connection-class.git'
+                }
+
+                licenses {
+                    license {
+                        name 'BSD License'
+                        url 'https://github.com/facebook/network-connection-class/blob/master/LICENSE'
+                        distribution 'repo'
+                    }
+                }
+
+                developers {
+                    developer {
+                        id 'facebook'
+                        name 'Facebook'
+                    }
+                }
+            }
+        }
+    }
+
+    task installArchives(type: Upload) {
+        configuration = configurations.archives
+        repositories {
+            mavenDeployer {
+                repository url: "file://${System.properties['user.home']}/.m2/repository"
+            }
+        }
+    }
+}
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..734c188
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,2 @@
+include ':connectionclass-sample'
+include ':connectionclass'
\ No newline at end of file