tree 401363eed860158b85593ad60c2fd9f9dbf167b6
parent 04bcf3ee761d8648d0247dd8322e3542c0319464
parent 63405d5d1c8f0a26fc1cc20976822782f5dd3568
author Bill Yi <byi@google.com> 1508514113 +0000
committer android-build-merger <android-build-merger@google.com> 1508514113 +0000

Import translations. DO NOT MERGE am: 9bc56553dd  -s ours
am: 63405d5d1c  -s ours

Change-Id: I9a11da2bbf5de6f7601d74cbde3bc67b81399452