tree f27993ec6c71e27f402c6f9d9067fa20cfe22907
parent 6d626acdbf395fd34cabb2cd30bb1ce52770d42d
parent 482b2c3b12f9ca779f641eb7dbddab093096f6a0
author Bill Yi <byi@google.com> 1499960352 +0000
committer android-build-merger <android-build-merger@google.com> 1499960352 +0000

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

Change-Id: I943722c47109b65dee52ad67292b14ec53074a24