tree c687fb1ed10c2d9bca3206b7385d2fec5fc70fdc
parent a051d6457549f3049b2306d960607b2f90e9d652
parent 27489df3786a30a8da93e2636aabb4abdf0049f4
author Bill Yi <byi@google.com> 1500742955 +0000
committer android-build-merger <android-build-merger@google.com> 1500742955 +0000

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

Change-Id: I910d4fbdc298dfeaab4dd72f65079375a117c71b