Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: dcd74a8a54 -s ours
Geoff Mendal [Tue, 2 Feb 2016 16:54:29 +0000 (16:54 +0000)]
am: b5d459abb5  -s ours

* commit 'b5d459abb522571a5feab1da879c93a2e223db18':
  Import translations. DO NOT MERGE


Trivial merge