tree fe3fa6ea1cb8a268456abd91255a58b281b8f812
parent bb04ab9aa1e72877da3c76cfc545e458541deb64
parent e721fbddb51f4786d76072e56cf5a71a48584458
author Bill Yi <byi@google.com> 1507752584 +0000
committer android-build-merger <android-build-merger@google.com> 1507752584 +0000

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

Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6