Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android...
authorJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 28 Oct 2014 15:13:10 +0000 (16:13 +0100)
committerJorge Antonio Diaz-Benito Soriano <jorge.diazbenitosoriano@gmail.com>
Tue, 28 Oct 2014 15:13:10 +0000 (16:13 +0100)
commitd7d4726929b09ad2dddd1e7ed3bb55c70c9b182d
tree2d06d6be02b47d7df6d6f37bcd99d5a3838cc6c0
parent9fbeb05ad9a4602c5bc366be37fef80ba45c9a1d
parente4058fa2c5776085eba5e68d13b97af32bbcd71f
Merge branch 'gradleWithInternalDependency' of github.com:owncloudChalmers/android into gradleWithInternalDependency

Conflicts:
setup_env.sh
setup_env.sh