tree a710d3f53fced0b56b4c230099fe6f629f45ca97
parent 20b54acfa8864ba2c7b6bfdf7a26a7cb6cb1356c
parent 040c26f63607119a20be09a0cc8a02f356aa8965
author Bill Yi <byi@google.com> 1501601067 +0000
committer android-build-merger <android-build-merger@google.com> 1501601067 +0000

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

Change-Id: I696a2a7a8ca66a4f901640e4f83c6c31f2c43d4d