tree fe3fa6ea1cb8a268456abd91255a58b281b8f812
parent 1c5bd422fdb4833b04e82c7a3a77d1a047d538b6
parent 2758e3af0975fb9f92741d730627b9f7e9ed29d6
author Bill Yi <byi@google.com> 1507502757 +0000
committer android-build-merger <android-build-merger@google.com> 1507502757 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2758e3af09  -s ours

Change-Id: I84cd6ad222b419aee8c31c26a07922dd5c7d6746