tree bf19400e6e3b87f7ded336a2e31f87edea54ebd1
parent be95e1d91e16816c620356910778625a4ef1f7a1
parent b484143b40a45509b32461ee480753b03428a60d
author Bill Yi <byi@google.com> 1505333245 +0000
committer android-build-merger <android-build-merger@google.com> 1505333245 +0000

Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: b484143b40  -s ours

Change-Id: I1b4a0545fe3e873bf3276e036f1f7edc067a25eb