Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement
authorDavid A. Velasco <dvelasco@solidgear.es>
Tue, 5 May 2015 11:42:51 +0000 (13:42 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Tue, 5 May 2015 11:42:51 +0000 (13:42 +0200)
commitc04d9c21986e6ea093a7f60f08aae81cabdec262
tree04e44d37f29e7d713bec93649ea03cbc16d88d54
parentef034fd6b8b5e23c73681415bd4a28d27524549a
parentb9c4fab1cb9072c112c19d8595731a50744db52b
Merge remote-tracking branch 'origin/pinEnhancement' into pinEnhancement
src/com/owncloud/android/ui/activity/PassCodeActivity.java