Merge branch 'master' of https://github.com/sjbalaji/AndroidApp

Conflicts: README.md
sjbalaji · Dec 15, 2014 · 08931a1 · 08931a1
2 parents 2f6bba9 + 0102a69
commit 08931a1
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,3 @@
+AndroidApp
+==========
+![Build Status] (https://api.travis-ci.org/sjbalaji/AndroidApp.svg?branch=master)