tree fc9702f012503330039033d43b48f09fe27ebb81
parent 46b9124306bd9d070a1fa7998487228719b50217
parent 174005bdf534a4453ea46a2d7130ac1a275e2c84
author Bill Yi <byi@google.com> 1499792720 +0000
committer android-build-merger <android-build-merger@google.com> 1499792720 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 69fe3e4678  -s ours am: 429e38cacb  -s ours
am: 174005bdf5  -s ours

Change-Id: I48aa069d34b6ef5b3e3fe4281d450c4a58a1b87d