From: Jorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Date: Tue, 28 Oct 2014 15:13:10 +0000 (+0100)
Subject: Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android... 
X-Git-Tag: oc-android-1.7.0_signed~69^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d7d4726929b09ad2dddd1e7ed3bb55c70c9b182d?ds=inline;hp=d7d4726929b09ad2dddd1e7ed3bb55c70c9b182d

Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency

Conflicts:
	setup_env.sh
---