tree 22a52d2d434995e0030431bcb62b86b8f86673af
parent 1c9e81ba213453ad2f8f0524854d285b969a4206
parent 988d19fa4264e8635aa430929a7312855ebed6ff
author Bill Yi <byi@google.com> 1493251443 +0000
committer android-build-merger <android-build-merger@google.com> 1493251443 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 73614be4c5  -s ours
am: 988d19fa42  -s ours

Change-Id: I27b7d46cddb85314a1e1ec3bd19cb01a8912d996