tree 5f5ca1deb150ac477a60871237c3d51eab210c90
parent 29e11599fb0e22ed75bd30e7104c10cad5587b6f
parent d33ed973396a7aa271123e07071258c4daefe1c3
author Bill Yi <byi@google.com> 1505768180 +0000
committer android-build-merger <android-build-merger@google.com> 1505768180 +0000

Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours am: 6c4c6b047c  -s ours
am: d33ed97339  -s ours

Change-Id: I209a4d9e4a7cfa4c019fa1d7c87a53e1298b1a71