Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 12:56:13 +0000 (14:56 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 22 Jun 2015 12:56:13 +0000 (14:56 +0200)
commit8c5b2b7b1360f425521d287528e2d7b157cf5eac
tree29fa773e552a2fbe1e0d105c442ea481001b2552
parentfc2636ddea1afe06b352004e822de7fe6ad97e26
parentfb57bbc8c868ad9b2ec304f0bade53b892eaa6e7
Merge remote-tracking branch 'origin/release-1.7.2' into release-1.7.2
res/values/strings.xml