Merge branch 'release-1.7.1' oc-android-1.7.1_signed
authormasensio <masensio@solidgear.es>
Tue, 7 Apr 2015 12:06:32 +0000 (14:06 +0200)
committermasensio <masensio@solidgear.es>
Tue, 7 Apr 2015 12:06:32 +0000 (14:06 +0200)

Trivial merge