am 49be9660
: (-s ours) am 90ef462c
: am 09256980
: am c74ef2f2
: am 7d6a0f9c
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '49be9660bf6ab52b7aeda68d5bc6fabd35edb7ae':
This commit is contained in: