From a364ad0909adc2b2f1c519b434749d60c2608c9f Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Thu, 3 Jul 2014 10:18:18 +0800
Subject: [PATCH 1/3] revert the version number

---
 src/main/AndroidManifest.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 2a85dcae..31a5db16 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="68"
-    android:versionName="2.2.0">
+    android:versionCode="67"
+    android:versionName="2.1.6">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

From c4c517b24dc0cd924e18f14957d7dd6c88ac68a1 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Wed, 9 Jul 2014 16:17:14 +0800
Subject: [PATCH 2/3] update travis

---
 .travis.yml     | 7 ++++---
 jni/shadowsocks | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e52c7439..101d538a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,15 @@ before_install:
 - sudo apt-get install ccache
 - export NDK_CCACHE=ccache
 - export ARCH=`uname -m`
-- wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz
-- tar xf android-sdk_r22.6.2-linux.tgz
+- wget http://dl.google.com/android/android-sdk_r23-linux.tgz
+- tar xf android-sdk_r23-linux.tgz
 - wget http://dl.google.com/android/ndk/android-ndk-r9d-linux-${ARCH}.tar.bz2
 - tar xf android-ndk-r9d-linux-${ARCH}.tar.bz2
 - export ANDROID_NDK_HOME=`pwd`/android-ndk-r9d
 - export ANDROID_HOME=`pwd`/android-sdk-linux
 - export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-- echo -e "y\ny\ny" | android update sdk --filter tools,platform-tools,build-tools-19.0.3,android-19,extra-google-m2repository,extra-android-m2repository --no-ui --no-https -a
+- echo "y" | android update sdk --filter tools,platform-tools,build-tools-20.0.0,android-19,extra-google-m2repository --no-ui --no-https -a
+- echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
 - ln -s $ANDROID_HOME/build-tools/20.0.0/zipalign $ANDROID_HOME/tools/
 install:
 - gem install --version 0.8.9 faraday
diff --git a/jni/shadowsocks b/jni/shadowsocks
index c2819d62..0017b7c1 160000
--- a/jni/shadowsocks
+++ b/jni/shadowsocks
@@ -1 +1 @@
-Subproject commit c2819d62433eaef7a23023184b88cc31a3f1992d
+Subproject commit 0017b7c1988c30c4b4850714908399248aa73a8e

From c2a1dacdbcd3f0b59363e3e0bcd0d56610e3d77e Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sat, 26 Jul 2014 08:23:58 +0800
Subject: [PATCH 3/3] Update .travis.yml

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 101d538a..86e1d9de 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,9 +15,9 @@ before_install:
 - tar xf android-sdk_r23-linux.tgz
 - wget http://dl.google.com/android/ndk/android-ndk-r9d-linux-${ARCH}.tar.bz2
 - tar xf android-ndk-r9d-linux-${ARCH}.tar.bz2
-- export ANDROID_NDK_HOME=`pwd`/android-ndk-r9d
+- export ANDROID_NDK=`pwd`/android-ndk-r9d
 - export ANDROID_HOME=`pwd`/android-sdk-linux
-- export PATH=${PATH}:${ANDROID_NDK_HOME}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
+- export PATH=${PATH}:${ANDROID_NDK}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 - echo "y" | android update sdk --filter tools,platform-tools,build-tools-20.0.0,android-19,extra-google-m2repository --no-ui --no-https -a
 - echo "y" | android update sdk --filter extra-android-m2repository --no-ui --no-https -a
 - ln -s $ANDROID_HOME/build-tools/20.0.0/zipalign $ANDROID_HOME/tools/