tree bf3870cb9f53c8f75e70a58a6e5dc45a65ce9a0e
parent 3db706109bbbd5e22b28f05a8b87e8c3d70dbfc3
parent 7f43068aa570bb15c9961f34edf42356d99f5b76
author The Android Open Source Project <initial-contribution@android.com> 1493740580 +0000
committer android-build-merger <android-build-merger@google.com> 1493740580 +0000

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

Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e