tree 8c8c1a5da9aa24101015a9625f2ab8f590b7668d
parent 0608857af59663c7aad99545fdaf17f44de67925
parent b978569fcec89111b571fbcf4e0442cbdbba0561
author Bill Yi <byi@google.com> 1501094846 +0000
committer android-build-merger <android-build-merger@google.com> 1501094846 +0000

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

Change-Id: I4f5887b8444b16dab976ba9cb9383f68bc2a9f59