tree f06696bad77adfec53b2c3bb35aa7c76ab687ab3
parent 5aef5be20bdc448b5071d3e0b250167751116383
parent 2f9af2aa69cd99b940e9df9e403c3309d3b2be7f
author Bill Yi <byi@google.com> 1484241885 +0000
committer android-build-merger <android-build-merger@google.com> 1484241885 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 2f9af2aa69  -s ours

Change-Id: Ia26f0fd7cf8f1c0937fd5b42fed1c8aee22111e0