tree 7d7411ca1ad2dd3cd554ba2b1b1e0b021fe77bb8
parent 11da97ccb1dce50a93a673147d5e6ab721235c50
parent 1cdf8ff72ea72c320a62b219e3ca07db9a652e4c
author Bill Yi <byi@google.com> 1500674319 +0000
committer android-build-merger <android-build-merger@google.com> 1500674319 +0000

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

Change-Id: Ief3a2219a09165b4dfa0c79f5e10098843eadc30