Merge remote-tracking branch 'remotes/upstream/master' into beta
authortobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:21:40 +0000 (20:21 +0100)
committertobiasKaminsky <tobias@kaminsky.me>
Sun, 29 Nov 2015 19:21:40 +0000 (20:21 +0100)
commit4b9a2fa00f866b49c880d3eeb94c580ecad2f81c
treed294c2593bcd26b3ee549746c2d779cc215e994e
parent26b1864940df7c02b1941355034fe83edd1d6bd2
parent82fd5e47e286a0b6c7f3084d5b5b4cea36638b42
Merge remote-tracking branch 'remotes/upstream/master' into beta
res/values-ja-rJP/strings.xml