am 94308a88
: (-s ours) am a4197d13
: am d1d9e350
: am 2e0679ed
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '94308a887707ccec1c0d0e2facafefa12ecf9b92':
This commit is contained in: