Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 18 Oct 2015 10:50:54 +0000 (12:50 +0200)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 18 Oct 2015 10:50:54 +0000 (12:50 +0200)
commite5caabd104b8e3f5bc416821050c1ce706ec04a0
tree1a4f904a8cabded1ce5a21969c698498ce901b7a
parent1db620124a09dfbf581f15ad2dee7f6fab240bce
parent47e74b62715ab62bfa1d003dac52f97381ce8d12
Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
AndroidManifest.xml
res/values/strings.xml