tree fc9702f012503330039033d43b48f09fe27ebb81
parent a709896372738ce8dd8c9b0688a4e9ecf03342de
parent 31ddf15a4287fcc631c51180812ce0014d59f56c
author Bill Yi <byi@google.com> 1499792711 +0000
committer android-build-merger <android-build-merger@google.com> 1499792711 +0000

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

Change-Id: I4468299006ad777e710b1ea8ae2877d102020f80