tree fc9702f012503330039033d43b48f09fe27ebb81
parent b7d61097c0f6a75baf7cfa15e11bc18f1f49e747
parent 69fe3e4678ea4ff03f03c0f2478e1b20d19042c8
author Bill Yi <byi@google.com> 1499792085 +0000
committer android-build-merger <android-build-merger@google.com> 1499792085 +0000

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

Change-Id: Ife0c099cf368e756f9ada5a88667563bcd90121a